April 2016 - Wine-Commits - list.winehq.org

Jacek Caban : wininet/tests: Added tests of InternetCrackUrl with URLs longer than INTERNET_MAX_URL_LENGTH.
by Alexandre Julliard April 27, 2016

April 27, 2016

Module: wine Branch: master Commit: 4be4e282b737a7cfbccf18552a581ee6de3ac13c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4be4e282b737a7cfbccf18552… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 27 14:18:42 2016 +0200 wininet/tests: Added tests of InternetCrackUrl with URLs longer than INTERNET_MAX_URL_LENGTH. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/url.c | 213 +++++++++++++++++++++++++++++++---------------- 1 file changed, 141 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4be4e282b737a7cfbccf1…

1 0

Jacek Caban : wininet: Rewrite InternetCrackUrlA to properly handle errors.
by Alexandre Julliard April 27, 2016

April 27, 2016

Module: wine Branch: master Commit: f1a8c8ae0a4d7a54ce08df2256881ae3f48dac30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1a8c8ae0a4d7a54ce08df225… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 27 14:18:31 2016 +0200 wininet: Rewrite InternetCrackUrlA to properly handle errors. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 244 ++++++++++++++++++++---------------------------- 1 file changed, 99 insertions(+), 145 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f1a8c8ae0a4d7a54ce08d…

1 0

Jacek Caban : wininet: Use heap_strndupAtoW in InternetOpenUrlA.
by Alexandre Julliard April 27, 2016

April 27, 2016

Module: wine Branch: master Commit: 82d413d96d49e47485a4f7fad5b7ba6a73814f11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d413d96d49e47485a4f7fad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 27 14:18:21 2016 +0200 wininet: Use heap_strndupAtoW in InternetOpenUrlA. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 537bf7d..a534a96 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3706,9 +3706,8 @@ HINTERNET WINAPI InternetOpenUrlA(HINTERNET hInternet, LPCSTR lpszUrl, LPCSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags, DWORD_PTR dwContext) { HINTERNET rc = NULL; - DWORD lenHeaders = 0; LPWSTR szUrl = NULL; - LPWSTR szHeaders = NULL; + WCHAR *headers = NULL; TRACE("\n"); @@ -3719,20 +3718,17 @@ HINTERNET WINAPI InternetOpenUrlA(HINTERNET hInternet, LPCSTR lpszUrl, } if(lpszHeaders) { - lenHeaders = MultiByteToWideChar(CP_ACP, 0, lpszHeaders, dwHeadersLength, NULL, 0 ); - szHeaders = heap_alloc(lenHeaders*sizeof(WCHAR)); - if(!szHeaders) { + headers = heap_strndupAtoW(lpszHeaders, dwHeadersLength, &dwHeadersLength); + if(!headers) { heap_free(szUrl); return NULL; } - MultiByteToWideChar(CP_ACP, 0, lpszHeaders, dwHeadersLength, szHeaders, lenHeaders); } - rc = InternetOpenUrlW(hInternet, szUrl, szHeaders, - lenHeaders, dwFlags, dwContext); + rc = InternetOpenUrlW(hInternet, szUrl, headers, dwHeadersLength, dwFlags, dwContext); heap_free(szUrl); - heap_free(szHeaders); + heap_free(headers); return rc; }

1 0

Alex Henrie : qedit: Implement IAMTimelineObj_SetTimelineType and add tests.
by Alexandre Julliard April 27, 2016

April 27, 2016

Module: wine Branch: master Commit: bebc10c625c34b5292857f6f7881b8bcfd81a293 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bebc10c625c34b5292857f6f7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Apr 26 23:12:49 2016 -0600 qedit: Implement IAMTimelineObj_SetTimelineType and add tests. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/timeline.c | 9 +++++++++ dlls/qedit/timeline.c | 6 ++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/qedit/tests/timeline.c b/dlls/qedit/tests/timeline.c index ecb4223..ca00063 100644 --- a/dlls/qedit/tests/timeline.c +++ b/dlls/qedit/tests/timeline.c @@ -82,6 +82,15 @@ static void test_timeline(void) hr = IAMTimelineObj_GetTimelineType(obj, &type); ok(hr == S_OK, "GetTimelineType failed: %08x\n", hr); ok(type == TIMELINE_MAJOR_TYPE_COMPOSITE, "Expected TIMELINE_MAJOR_TYPE_COMPOSITE got %d\n", type); + + for (type = 0; type < 256; type++) + { + hr = IAMTimelineObj_SetTimelineType(obj, type); + if (type == TIMELINE_MAJOR_TYPE_COMPOSITE) + ok(hr == S_OK, "SetTimelineType failed: %08x\n", hr); + else + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG got %08x\n", hr); + } } START_TEST(timeline) diff --git a/dlls/qedit/timeline.c b/dlls/qedit/timeline.c index 0ecb1b5..a2552d2 100644 --- a/dlls/qedit/timeline.c +++ b/dlls/qedit/timeline.c @@ -602,9 +602,11 @@ static HRESULT WINAPI TimelineObj_GetTimelineType(IAMTimelineObj *iface, TIMELIN static HRESULT WINAPI TimelineObj_SetTimelineType(IAMTimelineObj *iface, TIMELINE_MAJOR_TYPE type) { + /* MSDN says that this function is "not supported" */ TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); - FIXME("(%p)->(%d): not implemented!\n", This, type); - return E_NOTIMPL; + TRACE("(%p)->(%d)\n", This, type); + if (type != This->timeline_type) return E_INVALIDARG; + return S_OK; } static HRESULT WINAPI TimelineObj_GetUserID(IAMTimelineObj *iface, LONG *id)

1 0

Alex Henrie : qedit: Implement IAMTimelineObj_GetTimelineType and add tests.
by Alexandre Julliard April 27, 2016

April 27, 2016

Module: wine Branch: master Commit: 41d0860d4185090365d8041080379176c0b82183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41d0860d4185090365d804108… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Apr 26 23:12:48 2016 -0600 qedit: Implement IAMTimelineObj_GetTimelineType and add tests. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/timeline.c | 7 +++++++ dlls/qedit/timeline.c | 8 ++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/qedit/tests/timeline.c b/dlls/qedit/tests/timeline.c index d2b299c..ecb4223 100644 --- a/dlls/qedit/tests/timeline.c +++ b/dlls/qedit/tests/timeline.c @@ -75,6 +75,13 @@ static void test_timeline(void) hr = IAMTimelineObj_QueryInterface(obj, &IID_IAMTimeline, (void **)&timeline2); ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE got %08x\n", hr); ok(!timeline2, "Expected NULL got %p\n", timeline2); + + hr = IAMTimelineObj_GetTimelineType(obj, NULL); + ok(hr == E_POINTER, "Expected E_POINTER got %08x\n", hr); + + hr = IAMTimelineObj_GetTimelineType(obj, &type); + ok(hr == S_OK, "GetTimelineType failed: %08x\n", hr); + ok(type == TIMELINE_MAJOR_TYPE_COMPOSITE, "Expected TIMELINE_MAJOR_TYPE_COMPOSITE got %d\n", type); } START_TEST(timeline) diff --git a/dlls/qedit/timeline.c b/dlls/qedit/timeline.c index 3274892..0ecb1b5 100644 --- a/dlls/qedit/timeline.c +++ b/dlls/qedit/timeline.c @@ -52,6 +52,7 @@ static inline TimelineImpl *impl_from_IAMTimeline(IAMTimeline *iface) typedef struct { IAMTimelineObj IAMTimelineObj_iface; LONG ref; + TIMELINE_MAJOR_TYPE timeline_type; } TimelineObjImpl; static inline TimelineObjImpl *impl_from_IAMTimelineObj(IAMTimelineObj *iface) @@ -169,6 +170,7 @@ static HRESULT WINAPI Timeline_IAMTimeline_CreateEmptyNode(IAMTimeline *iface, I obj_impl->ref = 1; obj_impl->IAMTimelineObj_iface.lpVtbl = &IAMTimelineObj_VTable; + obj_impl->timeline_type = type; *obj = &obj_impl->IAMTimelineObj_iface; return S_OK; @@ -592,8 +594,10 @@ static HRESULT WINAPI TimelineObj_GetSubObjectLoaded(IAMTimelineObj *iface, BOOL static HRESULT WINAPI TimelineObj_GetTimelineType(IAMTimelineObj *iface, TIMELINE_MAJOR_TYPE *type) { TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); - FIXME("(%p)->(%p): not implemented!\n", This, type); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, type); + if (!type) return E_POINTER; + *type = This->timeline_type; + return S_OK; } static HRESULT WINAPI TimelineObj_SetTimelineType(IAMTimelineObj *iface, TIMELINE_MAJOR_TYPE type)

1 0

Alex Henrie : qedit: Stub out AMTimelineObj.
by Alexandre Julliard April 27, 2016

April 27, 2016

Module: wine Branch: master Commit: fca60cb558c00d2a54a019fc9b3a891bdb159c88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fca60cb558c00d2a54a019fc9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Apr 26 23:12:47 2016 -0600 qedit: Stub out AMTimelineObj. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/timeline.c | 5 - dlls/qedit/timeline.c | 403 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 401 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fca60cb558c00d2a54a01…

1 0

Alex Henrie : qedit/tests: Add timeline object creation tests.
by Alexandre Julliard April 27, 2016

April 27, 2016

Module: wine Branch: master Commit: cc2e4cfca8769f15aabc21778125221db92447ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc2e4cfca8769f15aabc21778… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Apr 26 23:12:46 2016 -0600 qedit/tests: Add timeline object creation tests. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/Makefile.in | 3 +- dlls/qedit/tests/timeline.c | 90 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+), 1 deletion(-) diff --git a/dlls/qedit/tests/Makefile.in b/dlls/qedit/tests/Makefile.in index 17d027f..07dd4b0 100644 --- a/dlls/qedit/tests/Makefile.in +++ b/dlls/qedit/tests/Makefile.in @@ -2,6 +2,7 @@ TESTDLL = qedit.dll IMPORTS = oleaut32 ole32 C_SRCS = \ - mediadet.c + mediadet.c \ + timeline.c RC_SRCS = qedit.rc diff --git a/dlls/qedit/tests/timeline.c b/dlls/qedit/tests/timeline.c new file mode 100644 index 0000000..6746b7d --- /dev/null +++ b/dlls/qedit/tests/timeline.c @@ -0,0 +1,90 @@ +/* + * Unit tests for Timeline + * + * Copyright (C) 2016 Alex Henrie + * + * 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 + */ + +#define COBJMACROS +#define CONST_VTABLE + +#include "wine/test.h" +#include "qedit.h" + +static void test_timeline(void) +{ + HRESULT hr; + IAMTimeline *timeline = NULL; + IAMTimeline *timeline2 = (IAMTimeline *)0xdeadbeef; + IAMTimelineObj *obj; + IAMTimelineObj obj_iface; + TIMELINE_MAJOR_TYPE type; + + hr = CoCreateInstance(&CLSID_AMTimeline, NULL, CLSCTX_INPROC_SERVER, &IID_IAMTimeline, (void **)&timeline); + ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), "CoCreateInstance failed: %08x\n", hr); + if (!timeline) return; + + hr = IAMTimeline_CreateEmptyNode(timeline, NULL, 0); +todo_wine + ok(hr == E_POINTER, "Expected E_POINTER got %08x\n", hr); + + hr = IAMTimeline_CreateEmptyNode(timeline, NULL, TIMELINE_MAJOR_TYPE_COMPOSITE); +todo_wine + ok(hr == E_POINTER, "Expected E_POINTER got %08x\n", hr); + + for (type = 0; type < 256; type++) + { + obj = &obj_iface; + hr = IAMTimeline_CreateEmptyNode(timeline, &obj, type); + switch (type) + { + case TIMELINE_MAJOR_TYPE_COMPOSITE: + case TIMELINE_MAJOR_TYPE_TRACK: + case TIMELINE_MAJOR_TYPE_SOURCE: + case TIMELINE_MAJOR_TYPE_TRANSITION: + case TIMELINE_MAJOR_TYPE_EFFECT: + case TIMELINE_MAJOR_TYPE_GROUP: +todo_wine + ok(hr == S_OK, "CreateEmptyNode failed: %08x\n", hr); + if (obj != &obj_iface) IAMTimelineObj_Release(obj); + break; + default: +todo_wine + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG got %08x\n", hr); + ok(obj == &obj_iface, "Expected %p got %p\n", &obj_iface, obj); + } + } + + obj = NULL; + hr = IAMTimeline_CreateEmptyNode(timeline, &obj, TIMELINE_MAJOR_TYPE_COMPOSITE); +todo_wine + ok(hr == S_OK, "CreateEmptyNode failed: %08x\n", hr); + if (!obj) return; + + hr = IAMTimelineObj_QueryInterface(obj, &IID_IAMTimeline, NULL); + ok(hr == E_POINTER, "Expected E_POINTER got %08x\n", hr); + + hr = IAMTimelineObj_QueryInterface(obj, &IID_IAMTimeline, (void **)&timeline2); + ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE got %08x\n", hr); + ok(!timeline2, "Expected NULL got %p\n", timeline2); +} + +START_TEST(timeline) +{ + CoInitialize(NULL); + test_timeline(); + CoUninitialize(); +}

1 0

Nikolay Sivov : ucrtbase: Implement _execute_onexit_table().
by Alexandre Julliard April 27, 2016

April 27, 2016

Module: wine Branch: master Commit: f3465ecbae0b7f99008c4ad63680b7315a247eec URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3465ecbae0b7f99008c4ad63… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 27 09:21:12 2016 +0300 ucrtbase: Implement _execute_onexit_table(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcrt/exit.c | 27 ++++++++ dlls/ucrtbase/tests/misc.c | 74 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 4 files changed, 103 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index ceb4e35..e138bf6 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -34,7 +34,7 @@ @ cdecl _endthread() ucrtbase._endthread @ cdecl _endthreadex(long) ucrtbase._endthreadex @ cdecl _errno() ucrtbase._errno -@ stub _execute_onexit_table +@ cdecl _execute_onexit_table(ptr) ucrtbase._execute_onexit_table @ cdecl _exit(long) ucrtbase._exit @ cdecl _fpieee_flt(long ptr ptr) ucrtbase._fpieee_flt @ cdecl _fpreset() ucrtbase._fpreset diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 60aa85d..9ba0891 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -400,6 +400,33 @@ int CDECL MSVCRT__register_onexit_function(MSVCRT__onexit_table_t *table, MSVCRT } /********************************************************************* + * _execute_onexit_table (UCRTBASE.@) + */ +int CDECL MSVCRT__execute_onexit_table(MSVCRT__onexit_table_t *table) +{ + MSVCRT__onexit_t *func; + + TRACE("(%p)\n", table); + + if (!table) + return -1; + + if (!table->_first || table->_first >= table->_last) + return 0; + + for (func = table->_last - 1; func >= table->_first; func--) + { + if (*func) + (*func)(); + } + + MSVCRT_free(table->_first); + memset(table, 0, sizeof(*table)); + MSVCRT__initialize_onexit_table(table); + return 0; +} + +/********************************************************************* * _set_purecall_handler (MSVCR71.@) */ MSVCRT_purecall_handler CDECL _set_purecall_handler(MSVCRT_purecall_handler function) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 0b77066..63ea465 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -37,6 +37,7 @@ typedef struct MSVCRT__onexit_table_t static int (CDECL *p_initialize_onexit_table)(MSVCRT__onexit_table_t *table); static int (CDECL *p_register_onexit_function)(MSVCRT__onexit_table_t *table, MSVCRT__onexit_t func); +static int (CDECL *p_execute_onexit_table)(MSVCRT__onexit_table_t *table); static void test__initialize_onexit_table(void) { @@ -98,8 +99,17 @@ static void test__initialize_onexit_table(void) table._first, table._last, table._end); } +static int g_onexit_called; static int CDECL onexit_func(void) { + g_onexit_called++; + return 0; +} + +static int CDECL onexit_func2(void) +{ + ok(g_onexit_called == 0, "got %d\n", g_onexit_called); + g_onexit_called++; return 0; } @@ -139,12 +149,75 @@ static void test__register_onexit_function(void) ok(f != table._last, "got %p, initial %p\n", table._last, f); } +static void test__execute_onexit_table(void) +{ + MSVCRT__onexit_table_t table; + int ret; + + if (!p_execute_onexit_table) + { + win_skip("_execute_onexit_table() is not available.\n"); + return; + } + + ret = p_execute_onexit_table(NULL); + ok(ret == -1, "got %d\n", ret); + + memset(&table, 0, sizeof(table)); + ret = p_initialize_onexit_table(&table); + ok(ret == 0, "got %d\n", ret); + + /* execute empty table */ + ret = p_execute_onexit_table(&table); + ok(ret == 0, "got %d\n", ret); + + /* same functions registered twice */ + ret = p_register_onexit_function(&table, onexit_func); + ok(ret == 0, "got %d\n", ret); + + ret = p_register_onexit_function(&table, NULL); + ok(ret == 0, "got %d\n", ret); + + ret = p_register_onexit_function(&table, onexit_func); + ok(ret == 0, "got %d\n", ret); + + ok(table._first != table._end, "got %p, %p\n", table._first, table._end); + g_onexit_called = 0; + ret = p_execute_onexit_table(&table); + ok(ret == 0, "got %d\n", ret); + ok(g_onexit_called == 2, "got %d\n", g_onexit_called); + ok(table._first == table._end, "got %p, %p\n", table._first, table._end); + + /* execute again, table is already empty */ + g_onexit_called = 0; + ret = p_execute_onexit_table(&table); + ok(ret == 0, "got %d\n", ret); + ok(g_onexit_called == 0, "got %d\n", g_onexit_called); + + /* check call order */ + memset(&table, 0, sizeof(table)); + ret = p_initialize_onexit_table(&table); + ok(ret == 0, "got %d\n", ret); + + ret = p_register_onexit_function(&table, onexit_func); + ok(ret == 0, "got %d\n", ret); + + ret = p_register_onexit_function(&table, onexit_func2); + ok(ret == 0, "got %d\n", ret); + + g_onexit_called = 0; + ret = p_execute_onexit_table(&table); + ok(ret == 0, "got %d\n", ret); + ok(g_onexit_called == 2, "got %d\n", g_onexit_called); +} + static void init(void) { HMODULE module = LoadLibraryA("ucrtbase.dll"); p_initialize_onexit_table = (void*)GetProcAddress(module, "_initialize_onexit_table"); p_register_onexit_function = (void*)GetProcAddress(module, "_register_onexit_function"); + p_execute_onexit_table = (void*)GetProcAddress(module, "_execute_onexit_table"); } START_TEST(misc) @@ -153,4 +226,5 @@ START_TEST(misc) test__initialize_onexit_table(); test__register_onexit_function(); + test__execute_onexit_table(); } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 3ac30eb..cfb2a0a 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -279,7 +279,7 @@ @ varargs _execle(str str) @ varargs _execlp(str str) @ varargs _execlpe(str str) -@ stub _execute_onexit_table +@ cdecl _execute_onexit_table(ptr) MSVCRT__execute_onexit_table @ cdecl _execv(str ptr) @ cdecl _execve(str ptr ptr) MSVCRT__execve @ cdecl _execvp(str ptr)

1 0

Austin English : fsutil: Add stub program.
by Alexandre Julliard April 27, 2016

April 27, 2016

Module: wine Branch: master Commit: db77a0dba67a3a808b6dda144810957ecb8342a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db77a0dba67a3a808b6dda144… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Dec 14 00:46:30 2015 -0600 fsutil: Add stub program. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + programs/fsutil/Makefile.in | 5 +++++ programs/fsutil/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+) diff --git a/configure b/configure index dcec63c..5fb33d6 100755 --- a/configure +++ b/configure @@ -1462,6 +1462,7 @@ enable_expand enable_explorer enable_extrac32 enable_findstr +enable_fsutil enable_hh enable_hostname enable_icacls @@ -18215,6 +18216,7 @@ wine_fn_config_program expand enable_expand install wine_fn_config_program explorer enable_explorer clean,install wine_fn_config_program extrac32 enable_extrac32 install wine_fn_config_program findstr enable_findstr install +wine_fn_config_program fsutil enable_fsutil install wine_fn_config_program hh enable_hh install wine_fn_config_program hostname enable_hostname clean,install wine_fn_config_program icacls enable_icacls install diff --git a/configure.ac b/configure.ac index b0d94ce..597b84e 100644 --- a/configure.ac +++ b/configure.ac @@ -3463,6 +3463,7 @@ WINE_CONFIG_PROGRAM(expand,,[install]) WINE_CONFIG_PROGRAM(explorer,,[clean,install]) WINE_CONFIG_PROGRAM(extrac32,,[install]) WINE_CONFIG_PROGRAM(findstr,,[install]) +WINE_CONFIG_PROGRAM(fsutil,,[install]) WINE_CONFIG_PROGRAM(hh,,[install]) WINE_CONFIG_PROGRAM(hostname,,[clean,install]) WINE_CONFIG_PROGRAM(icacls,,[install]) diff --git a/programs/fsutil/Makefile.in b/programs/fsutil/Makefile.in new file mode 100644 index 0000000..f339c4c --- /dev/null +++ b/programs/fsutil/Makefile.in @@ -0,0 +1,5 @@ +MODULE = fsutil.exe +APPMODE = -mconsole -municode + +C_SRCS = \ + main.c diff --git a/programs/fsutil/main.c b/programs/fsutil/main.c new file mode 100644 index 0000000..2bce87e --- /dev/null +++ b/programs/fsutil/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2016 Austin English + * + * 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 + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(fsutil); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Nikolay Sivov : dwrite: For object creation helpers with many arguments pack them in structures.
by Alexandre Julliard April 27, 2016

April 27, 2016

Module: wine Branch: master Commit: 5fb8acc53659e70f0c38260c3143d88a95739411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb8acc53659e70f0c38260c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 27 11:19:41 2016 +0300 dwrite: For object creation helpers with many arguments pack them in structures. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 35 ++++++++++++++++++--- dlls/dwrite/font.c | 72 +++++++++++++++++++++----------------------- dlls/dwrite/layout.c | 59 +++++++++++------------------------- dlls/dwrite/main.c | 60 ++++++++++++++++++++++++++++++------ 4 files changed, 133 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5fb8acc53659e70f0c382…

1 0