September 2014 - Wine-commits

Alistair Leslie-Hughes : cmd: Dont assume cmd.exe is the first argument.
by Alexandre Julliard 10 Sep '14

10 Sep '14

Module: wine Branch: master Commit: 213b244cb5d98a27478252deaf57c2685a3d71a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=213b244cb5d98a27478252dea… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Mar 15 20:00:06 2014 +1100 cmd: Dont assume cmd.exe is the first argument. --- programs/cmd/wcmdmain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index c475ad2..e5865e6 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2363,7 +2363,7 @@ int wmain (int argc, WCHAR *argvW[]) */ cmdLine = GetCommandLineW(); WINE_TRACE("Full commandline '%s'\n", wine_dbgstr_w(cmdLine)); - args = 1; /* start at first arg, skipping cmd.exe itself */ + args = 0; opt_c = opt_k = opt_q = opt_s = FALSE; WCMD_parameter(cmdLine, args, &argPos, TRUE, TRUE);

1 0

Alexandre Julliard : kernel32: Pass the correct completion values in ReadFileScatter and WriteFileGather.
by Alexandre Julliard 10 Sep '14

10 Sep '14

Module: wine Branch: master Commit: 553ba810b8e5034415992d99bf970b2ebb7a85ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=553ba810b8e5034415992d99b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 10 13:49:40 2014 +0200 kernel32: Pass the correct completion values in ReadFileScatter and WriteFileGather. Test case based on a patch by Guo Jian. --- dlls/kernel32/file.c | 10 ++++++-- dlls/kernel32/tests/file.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 412659b..cf683df 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -374,17 +374,20 @@ BOOL WINAPI ReadFileScatter( HANDLE file, FILE_SEGMENT_ELEMENT *segments, DWORD { PIO_STATUS_BLOCK io_status; LARGE_INTEGER offset; + void *cvalue = NULL; NTSTATUS status; TRACE( "(%p %p %u %p)\n", file, segments, count, overlapped ); offset.u.LowPart = overlapped->u.s.Offset; offset.u.HighPart = overlapped->u.s.OffsetHigh; + if (!((ULONG_PTR)overlapped->hEvent & 1)) cvalue = overlapped; io_status = (PIO_STATUS_BLOCK)overlapped; io_status->u.Status = STATUS_PENDING; io_status->Information = 0; - status = NtReadFileScatter( file, NULL, NULL, NULL, io_status, segments, count, &offset, NULL ); + status = NtReadFileScatter( file, overlapped->hEvent, NULL, cvalue, io_status, + segments, count, &offset, NULL ); if (status) SetLastError( RtlNtStatusToDosError(status) ); return !status; } @@ -513,17 +516,20 @@ BOOL WINAPI WriteFileGather( HANDLE file, FILE_SEGMENT_ELEMENT *segments, DWORD { PIO_STATUS_BLOCK io_status; LARGE_INTEGER offset; + void *cvalue = NULL; NTSTATUS status; TRACE( "%p %p %u %p\n", file, segments, count, overlapped ); offset.u.LowPart = overlapped->u.s.Offset; offset.u.HighPart = overlapped->u.s.OffsetHigh; + if (!((ULONG_PTR)overlapped->hEvent & 1)) cvalue = overlapped; io_status = (PIO_STATUS_BLOCK)overlapped; io_status->u.Status = STATUS_PENDING; io_status->Information = 0; - status = NtWriteFileGather( file, NULL, NULL, NULL, io_status, segments, count, &offset, NULL ); + status = NtWriteFileGather( file, overlapped->hEvent, NULL, cvalue, io_status, + segments, count, &offset, NULL ); if (status) SetLastError( RtlNtStatusToDosError(status) ); return !status; } diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 492a34f..ddfa019 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3959,6 +3959,63 @@ static void test_SetFileValidData(void) DeleteFileA(filename); } +static void test_WriteFileGather(void) +{ + char temp_path[MAX_PATH], filename[MAX_PATH]; + HANDLE hfile, hiocp1, hiocp2; + DWORD ret, size; + ULONG_PTR key; + FILE_SEGMENT_ELEMENT fse[2]; + OVERLAPPED ovl, *povl = NULL; + SYSTEM_INFO si; + LPVOID buf = NULL; + + ret = GetTempPathA( MAX_PATH, temp_path ); + ok( ret != 0, "GetTempPathA error %d\n", GetLastError() ); + ok( ret < MAX_PATH, "temp path should fit into MAX_PATH\n" ); + ret = GetTempFileNameA( temp_path, "wfg", 0, filename ); + ok( ret != 0, "GetTempFileNameA error %d\n", GetLastError() ); + + hfile = CreateFileA( filename, GENERIC_READ | GENERIC_WRITE, 0, 0, CREATE_ALWAYS, + FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED | FILE_ATTRIBUTE_NORMAL, 0 ); + ok( hfile != INVALID_HANDLE_VALUE, "CreateFile failed err %u\n", GetLastError() ); + if (hfile == INVALID_HANDLE_VALUE) return; + + hiocp1 = CreateIoCompletionPort( INVALID_HANDLE_VALUE, NULL, 999, 0 ); + hiocp2 = CreateIoCompletionPort( hfile, hiocp1, 999, 0 ); + ok( hiocp2 != 0, "CreateIoCompletionPort failed err %u\n", GetLastError() ); + + GetSystemInfo( &si ); + buf = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); + ok( buf != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + + memset( &ovl, 0, sizeof(ovl) ); + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = buf; + if (!WriteFileGather( hfile, fse, si.dwPageSize, NULL, &ovl )) + ok( GetLastError() == ERROR_IO_PENDING, "WriteFileGather failed err %u\n", GetLastError() ); + + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); + ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError()); + ok( povl == &ovl, "wrong ovl %p\n", povl ); + + memset( &ovl, 0, sizeof(ovl) ); + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = buf; + if (!ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl )) + ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); + + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); + ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError()); + ok( povl == &ovl, "wrong ovl %p\n", povl ); + + CloseHandle( hfile ); + CloseHandle( hiocp1 ); + CloseHandle( hiocp2 ); + VirtualFree( buf, 0, MEM_RELEASE ); + DeleteFileA( filename ); +} + static unsigned file_map_access(unsigned access) { if (access & GENERIC_READ) access |= FILE_GENERIC_READ; @@ -4132,5 +4189,6 @@ START_TEST(file) test_GetFileInformationByHandleEx(); test_OpenFileById(); test_SetFileValidData(); + test_WriteFileGather(); test_file_access(); }

1 0

Jacek Caban : mshtml: Bind events to document node instead of body element.
by Alexandre Julliard 10 Sep '14

10 Sep '14

Module: wine Branch: master Commit: 5d2ee3ee82323346da6ba4cfb3931e6296aa480c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d2ee3ee82323346da6ba4cfb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 10 17:30:24 2014 +0200 mshtml: Bind events to document node instead of body element. --- dlls/mshtml/htmlevent.c | 12 ++---------- dlls/mshtml/tests/events.html | 21 ++++++++++++++++++--- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 33f763e..75b41d3 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1328,16 +1328,8 @@ static HRESULT ensure_nsevent_handler(HTMLDocumentNode *doc, event_target_t *eve return S_OK; if(event_info[eid].flags & EVENT_BIND_TO_BODY) { - nsIDOMHTMLElement *nsbody; - nsresult nsres; - - nsres = nsIDOMHTMLDocument_GetBody(doc->nsdoc, &nsbody); - if(NS_SUCCEEDED(nsres) && nsbody) { - nsnode = (nsIDOMNode*)nsbody; - }else { - ERR("GetBody failed: %08x\n", nsres); - return E_UNEXPECTED; - } + nsnode = doc->node.nsnode; + nsIDOMNode_AddRef(nsnode); } doc->event_vector[eid] = TRUE; diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index bf8a21f..d4e2644 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -114,14 +114,16 @@ function test_handler_this() { ok(calls == "div2,div2*,div1,div1*,body,body*", "calls = " + calls); } -function runTests(t) { +window.onload = function() { try { ok(cnt == 1, "cnt=" + cnt + " exception during loading?"); - ok(t === window, "t !== window"); + ok(this === window, "this !== window"); ok(typeof(window.onload) === "function", "typeof(window.onload) = " + typeof(window.onload)); ok(document.body.onload === window.onload, "document.body.onload !== window.onload"); + ok(img_onload_called, "img.onload not called before window.onload"); + test_scriptfor(); ondataavailable_test(); test_handler_this(); @@ -132,8 +134,18 @@ function runTests(t) { external.reportSuccess(); } </script> +<script> +var img = document.createElement("img"); +img.src = "http://test.winehq.org/tests/winehq_snapshot/index_files/winehq_logo_glass.…"; + +var img_onload_called = false; +img.onload = function() { + external.trace("img.onload"); + img_onload_called = true; +} +</script> </head> -<body onload="runTests(this)"> +<body> <div id="divid"></div> <div id="divid2"></div> <script event="onclick" for="divid2"> @@ -152,5 +164,8 @@ function runTests(t) { cnt++; })(); </script> +<script> +document.body.appendChild(img); +</script> </body> </html>

1 0

Nikolay Sivov : msvcrt: Added __dstbias() export.
by Alexandre Julliard 10 Sep '14

10 Sep '14

Module: wine Branch: master Commit: 1228f0bba500e2c3644fb1a10f80947338b73032 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1228f0bba500e2c3644fb1a10… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 10 21:39:17 2014 +0400 msvcrt: Added __dstbias() export. --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/tests/time.c | 11 +++++++++++ dlls/msvcrt/time.c | 8 ++++---- 9 files changed, 27 insertions(+), 16 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index f8062f9..0d6e2dc 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -584,7 +584,7 @@ @ cdecl __daylight() MSVCRT___p__daylight @ cdecl __dllonexit(ptr ptr ptr) @ cdecl __doserrno() MSVCRT___doserrno -@ stub __dstbias +@ cdecl __dstbias() MSVCRT___p__dstbias @ stub ___fls_getvalue(a)4 @ stub ___fls_setvalue(a)8 @ cdecl __fpecode() @@ -633,7 +633,7 @@ @ cdecl __p__acmdln() @ cdecl __p__commode() @ cdecl __p__daylight() MSVCRT___p__daylight -@ cdecl __p__dstbias() +@ cdecl __p__dstbias() MSVCRT___p__dstbias @ cdecl __p__environ() MSVCRT___p__environ @ cdecl __p__fmode() @ cdecl __p__iob() MSVCRT___iob_func diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 6a328eb..1114190 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -934,7 +934,7 @@ @ cdecl __daylight() MSVCRT___p__daylight @ cdecl __dllonexit(ptr ptr ptr) @ cdecl __doserrno() MSVCRT___doserrno -@ stub __dstbias +@ cdecl __dstbias() MSVCRT___p__dstbias @ cdecl __fpecode() @ stub __free_locale @ stub __get_current_locale @@ -982,7 +982,7 @@ @ cdecl __p__acmdln() @ cdecl __p__commode() @ cdecl __p__daylight() MSVCRT___p__daylight -@ cdecl __p__dstbias() +@ cdecl __p__dstbias() MSVCRT___p__dstbias @ cdecl __p__environ() MSVCRT___p__environ @ cdecl __p__fmode() @ cdecl __p__iob() MSVCRT___iob_func diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 1a94ee2..fb47e78 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -171,7 +171,7 @@ @ cdecl __p__amblksiz() @ cdecl __p__commode() @ cdecl __p__daylight() MSVCRT___p__daylight -@ cdecl __p__dstbias() +@ cdecl __p__dstbias() MSVCRT___p__dstbias @ cdecl __p__environ() MSVCRT___p__environ @ stub __p__fileinfo() @ cdecl __p__fmode() diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 127a440..8b868db 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -166,7 +166,7 @@ @ cdecl __p__amblksiz() @ cdecl __p__commode() @ cdecl __p__daylight() MSVCRT___p__daylight -@ cdecl __p__dstbias() +@ cdecl __p__dstbias() MSVCRT___p__dstbias @ cdecl __p__environ() MSVCRT___p__environ @ stub __p__fileinfo() @ cdecl __p__fmode() diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 3902c85..fc313a4 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -220,7 +220,7 @@ @ cdecl __daylight() MSVCRT___p__daylight @ cdecl __dllonexit(ptr ptr ptr) @ cdecl __doserrno() MSVCRT___doserrno -@ stub __dstbias +@ cdecl __dstbias() MSVCRT___p__dstbias @ stub -arch=i386 ___fls_getvalue(a)4 @ stub -arch=x86_64 __fls_getvalue @ stub -arch=i386 ___fls_setvalue(a)8 @@ -277,7 +277,7 @@ @ cdecl __p__amblksiz() @ cdecl __p__commode() @ cdecl __p__daylight() MSVCRT___p__daylight -@ cdecl __p__dstbias() +@ cdecl __p__dstbias() MSVCRT___p__dstbias @ cdecl __p__environ() MSVCRT___p__environ @ cdecl __p__fmode() @ cdecl __p__iob() MSVCRT___iob_func diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index fa19f40..a89dbfb 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -211,7 +211,7 @@ @ cdecl __daylight() MSVCRT___p__daylight @ cdecl __dllonexit(ptr ptr ptr) @ cdecl __doserrno() MSVCRT___doserrno -@ stub __dstbias +@ cdecl __dstbias() MSVCRT___p__dstbias @ stub ___fls_getvalue(a)4 @ stub ___fls_setvalue(a)8 @ cdecl __fpecode() @@ -266,7 +266,7 @@ @ cdecl __p__amblksiz() @ cdecl __p__commode() @ cdecl __p__daylight() MSVCRT___p__daylight -@ cdecl __p__dstbias() +@ cdecl __p__dstbias() MSVCRT___p__dstbias @ cdecl __p__environ() MSVCRT___p__environ @ cdecl __p__fmode() @ cdecl __p__iob() MSVCRT___iob_func diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 01788e1..742ada3 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -209,7 +209,7 @@ @ cdecl __daylight() MSVCRT___p__daylight @ cdecl __dllonexit(ptr ptr ptr) @ cdecl __doserrno() MSVCRT___doserrno -# stub __dstbias() +@ cdecl __dstbias() MSVCRT___p__dstbias @ cdecl __fpecode() @ stub __get_app_type @ cdecl __getmainargs(ptr ptr ptr long ptr) @@ -255,7 +255,7 @@ @ cdecl __p__amblksiz() @ cdecl __p__commode() @ cdecl __p__daylight() MSVCRT___p__daylight -@ cdecl __p__dstbias() +@ cdecl __p__dstbias() MSVCRT___p__dstbias @ cdecl __p__environ() MSVCRT___p__environ @ stub __p__fileinfo() @ cdecl __p__fmode() diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 71e58ba..995ece2 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -47,6 +47,7 @@ static errno_t (__cdecl *p_localtime64_s)(struct tm*, __time64_t*); static int* (__cdecl *p__daylight)(void); static int* (__cdecl *p___p__daylight)(void); static long* (__cdecl *p___p__dstbias)(void); +static long* (__cdecl *p__dstbias)(void); static long* (__cdecl *p___p__timezone)(void); static size_t (__cdecl *p_strftime)(char *, size_t, const char *, const struct tm *); static size_t (__cdecl *p_wcsftime)(wchar_t *, size_t, const wchar_t *, const struct tm *); @@ -67,6 +68,7 @@ static void init(void) p__daylight = (void*)GetProcAddress(hmod, "__daylight"); p___p__daylight = (void*)GetProcAddress(hmod, "__p__daylight"); p___p__dstbias = (void*)GetProcAddress(hmod, "__p__dstbias"); + p__dstbias = (void*)GetProcAddress(hmod, "__dstbias"); p___p__timezone = (void*)GetProcAddress(hmod, "__p__timezone"); p_strftime = (void*)GetProcAddress(hmod, "strftime"); p_wcsftime = (void*)GetProcAddress(hmod, "wcsftime"); @@ -821,6 +823,15 @@ static void test__tzset(void) return; } + if (p__dstbias) { + ret = *p__dstbias(); + ok(ret == -3600, "*__dstbias() = %d\n", ret); + ret = *p___p__dstbias(); + ok(ret == -3600, "*__p__dstbias() = %d\n", ret); + } + else + win_skip("__dstbias() is not available.\n"); + _snprintf(TZ_env,255,"TZ=%s",(getenv("TZ")?getenv("TZ"):"")); ret = *p___p__daylight(); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 9c15bf4..e52e1d8 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -875,7 +875,7 @@ MSVCRT___time32_t CDECL MSVCRT_time(MSVCRT___time32_t* buf) #endif /********************************************************************* - * __p_daylight (MSVCRT.@) + * __p__daylight (MSVCRT.@) */ int * CDECL MSVCRT___p__daylight(void) { @@ -883,15 +883,15 @@ int * CDECL MSVCRT___p__daylight(void) } /********************************************************************* - * __p_dstbias (MSVCRT.@) + * __p__dstbias (MSVCRT.@) */ -int * CDECL __p__dstbias(void) +int * CDECL MSVCRT___p__dstbias(void) { return &MSVCRT__dstbias; } /********************************************************************* - * __p_timezone (MSVCRT.@) + * __p__timezone (MSVCRT.@) */ MSVCRT_long * CDECL MSVCRT___p__timezone(void) {

1 0

Aric Stewart : dwrite: Break fontfamily data into its own structure.
by Alexandre Julliard 10 Sep '14

10 Sep '14

Module: wine Branch: master Commit: 15ef946f53f66f327a7ed45a0d2856aaff726561 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15ef946f53f66f327a7ed45a0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Sep 8 19:10:48 2014 -0500 dwrite: Break fontfamily data into its own structure. --- dlls/dwrite/font.c | 61 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 25 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 8b59a37..efa305e 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -58,6 +58,14 @@ struct dwrite_font_data { WCHAR *facename; }; +struct dwrite_fontfamily_data { + IDWriteLocalizedStrings *familyname; + + struct dwrite_font_data **fonts; + UINT32 font_count; + UINT32 alloc; +}; + struct dwrite_fontcollection { IDWriteFontCollection IDWriteFontCollection_iface; LONG ref; @@ -71,13 +79,9 @@ struct dwrite_fontfamily { IDWriteFontFamily IDWriteFontFamily_iface; LONG ref; - struct dwrite_font_data **fonts; - UINT32 font_count; - UINT32 alloc; + struct dwrite_fontfamily_data *data; IDWriteFontCollection* collection; - - IDWriteLocalizedStrings *familyname; }; struct dwrite_font { @@ -744,13 +748,14 @@ static ULONG WINAPI dwritefontfamily_Release(IDWriteFontFamily *iface) if (!ref) { int i; - IDWriteLocalizedStrings_Release(This->familyname); + IDWriteLocalizedStrings_Release(This->data->familyname); if (This->collection) IDWriteFontCollection_Release(This->collection); - for (i = 0; i < This->font_count; i++) - _free_font_data(This->fonts[i]); - heap_free(This->fonts); + for (i = 0; i < This->data->font_count; i++) + _free_font_data(This->data->fonts[i]); + heap_free(This->data->fonts); + heap_free(This->data); heap_free(This); } @@ -775,19 +780,19 @@ static UINT32 WINAPI dwritefontfamily_GetFontCount(IDWriteFontFamily *iface) { struct dwrite_fontfamily *This = impl_from_IDWriteFontFamily(iface); TRACE("(%p)\n", This); - return This->font_count; + return This->data->font_count; } static HRESULT WINAPI dwritefontfamily_GetFont(IDWriteFontFamily *iface, UINT32 index, IDWriteFont **font) { struct dwrite_fontfamily *This = impl_from_IDWriteFontFamily(iface); TRACE("(%p)->(%u %p)\n", This, index, font); - if (This->font_count > 0) + if (This->data->font_count > 0) { HRESULT hr; - if (index >= This->font_count) + if (index >= This->data->font_count) return E_INVALIDARG; - hr = create_font_from_data(This->fonts[index], font); + hr = create_font_from_data(This->data->fonts[index], font); if (SUCCEEDED(hr)) { struct dwrite_font *font_data = impl_from_IDWriteFont(*font); @@ -803,7 +808,7 @@ static HRESULT WINAPI dwritefontfamily_GetFont(IDWriteFontFamily *iface, UINT32 static HRESULT WINAPI dwritefontfamily_GetFamilyNames(IDWriteFontFamily *iface, IDWriteLocalizedStrings **names) { struct dwrite_fontfamily *This = impl_from_IDWriteFontFamily(iface); - return clone_localizedstring(This->familyname, names); + return clone_localizedstring(This->data->familyname, names); } static HRESULT WINAPI dwritefontfamily_GetFirstMatchingFont(IDWriteFontFamily *iface, DWRITE_FONT_WEIGHT weight, @@ -815,26 +820,26 @@ static HRESULT WINAPI dwritefontfamily_GetFirstMatchingFont(IDWriteFontFamily *i TRACE("(%p)->(%d %d %d %p)\n", This, weight, stretch, style, font); /* fallback for system font collections */ - if (This->font_count == 0) + if (This->data->font_count == 0) { memset(&lf, 0, sizeof(lf)); lf.lfWeight = weight; lf.lfItalic = style == DWRITE_FONT_STYLE_ITALIC; - IDWriteLocalizedStrings_GetString(This->familyname, 0, lf.lfFaceName, LF_FACESIZE); + IDWriteLocalizedStrings_GetString(This->data->familyname, 0, lf.lfFaceName, LF_FACESIZE); return create_font_from_logfont(&lf, font); } else { int i; - for (i = 0; i < This->font_count; i++) + for (i = 0; i < This->data->font_count; i++) { - if (style == This->fonts[i]->style && - weight == This->fonts[i]->weight && - stretch == This->fonts[i]->stretch) + if (style == This->data->fonts[i]->style && + weight == This->data->fonts[i]->weight && + stretch == This->data->fonts[i]->stretch) { HRESULT hr; - hr = create_font_from_data(This->fonts[i], font); + hr = create_font_from_data(This->data->fonts[i], font); if (SUCCEEDED(hr)) { struct dwrite_font *font_data = impl_from_IDWriteFont(*font); @@ -1043,14 +1048,20 @@ static HRESULT create_fontfamily(IDWriteLocalizedStrings *familyname, IDWriteFon This = heap_alloc(sizeof(struct dwrite_fontfamily)); if (!This) return E_OUTOFMEMORY; + This->data = heap_alloc(sizeof(struct dwrite_fontfamily_data)); + if (!This) + { + heap_free(This); + return E_OUTOFMEMORY; + } This->IDWriteFontFamily_iface.lpVtbl = &fontfamilyvtbl; This->ref = 1; - This->font_count = 0; - This->alloc = 2; - This->fonts = heap_alloc(sizeof(*This->fonts) * 2); + This->data->font_count = 0; + This->data->alloc = 2; + This->data->fonts = heap_alloc(sizeof(*This->data->fonts) * 2); This->collection = NULL; - This->familyname = familyname; + This->data->familyname = familyname; *family = &This->IDWriteFontFamily_iface;

1 0

Alexandre Julliard : dpnet: Add a missing coclass registration.
by Alexandre Julliard 10 Sep '14

10 Sep '14

Module: wine Branch: master Commit: e98eee8ad814b88985658fe396f5ffb0133d2658 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e98eee8ad814b88985658fe39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 10 20:38:35 2014 +0200 dpnet: Add a missing coclass registration. --- dlls/dpnet/dpnet.idl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/dpnet/dpnet.idl b/dlls/dpnet/dpnet.idl index de20bdd..40094d5 100644 --- a/dlls/dpnet/dpnet.idl +++ b/dlls/dpnet/dpnet.idl @@ -56,6 +56,15 @@ coclass DirectPlay8Address { interface IDirectPlay8Address; } coclass DirectPlay8LobbiedApplication { interface IDirectPlay8LobbiedApplication; } [ + helpstring("DirectPlay8LobbyClient Object"), + threading(both), + progid("DirectPlay8Lobby.LobbyClient.1"), + vi_progid("DirectPlay8Lobby.LobbyClient"), + uuid(3b2b6775-70b6-45af-8dea-a209c69559f3) +] +coclass DirectPlay8LobbyClient { interface IDirectPlay8LobbyClient; } + +[ helpstring("DirectPlay8 Thread Pool Object"), threading(both), uuid(fc47060e-6153-4b34-b975-8e4121eb7f3c)

1 0

André Hentschel : msvcmaker: Allow hyphens in dll names.
by Alexandre Julliard 09 Sep '14

09 Sep '14

Module: wine Branch: master Commit: 97daaba1af0f433d84f37539af47cb98e57fc6e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97daaba1af0f433d84f37539a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 9 00:04:31 2014 +0200 msvcmaker: Allow hyphens in dll names. --- tools/winapi/msvcmaker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index 0c82420..d0d0b63 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -178,7 +178,7 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) { next; } - if(/^MODULE\s*=\s*([\w\.]+)$/) { + if(/^MODULE\s*=\s*([\w\.-]+)$/) { $module = $1; } elsif (/^\@MAKE_IMPLIB_RULES\@/) { $type = "lib";

1 0

André Hentschel : msvcmaker: Allow ocx tests.
by Alexandre Julliard 09 Sep '14

09 Sep '14

Module: wine Branch: master Commit: 71427de9634134e886e48eb89e2a9bf0ad83c171 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71427de9634134e886e48eb89… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 9 00:04:49 2014 +0200 msvcmaker: Allow ocx tests. --- tools/winapi/msvcmaker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index d0d0b63..a18eb97 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -199,7 +199,7 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) { $dir =~ s/\/Makefile\.in$//; my $dsp_file = $testdll; - $dsp_file =~ s/\.(dll|drv)$/_test.dsp/; + $dsp_file =~ s/\.(dll|drv|ocx)$/_test.dsp/; $dsp_file = "$dir/$dsp_file"; $wine_test_dsp_files{$dsp_file}{files} = [@files, "testlist.c"];

1 0

Jactry Zeng : mshtml/tests: Fix typo.
by Alexandre Julliard 09 Sep '14

09 Sep '14

Module: wine Branch: master Commit: 4b1901d8c046d5d327397827e94f04cdc6b525b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b1901d8c046d5d327397827e… Author: Jactry Zeng <wine(a)jactry.com> Date: Tue Sep 9 14:28:54 2014 +0800 mshtml/tests: Fix typo. --- dlls/mshtml/tests/dom.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 03c3159..f946550 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5599,7 +5599,7 @@ static void test_body_funs(IHTMLBodyElement *body) hres = IHTMLBodyElement_get_bgColor(body, &vbg); ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); - ok(V_VT(&vDefaultbg) == VT_BSTR, "V_VT(&vDefaultbg) != VT_BSTR\n"); + ok(V_VT(&vbg) == VT_BSTR, "V_VT(&vbg) != VT_BSTR\n"); ok(!strcmp_wa(V_BSTR(&vbg), "#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); VariantClear(&vbg); @@ -6081,7 +6081,7 @@ static void test_tr_elem(IHTMLElement *elem) hres = IHTMLTableRow_get_bgColor(row, &vbg); ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); - ok(V_VT(&vDefaultbg) == VT_BSTR, "V_VT(&vDefaultbg) != VT_BSTR\n"); + ok(V_VT(&vbg) == VT_BSTR, "V_VT(&vbg) != VT_BSTR\n"); ok(!strcmp_wa(V_BSTR(&vbg), "#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); VariantClear(&vbg); @@ -6093,7 +6093,7 @@ static void test_tr_elem(IHTMLElement *elem) hres = IHTMLTableRow_get_bgColor(row, &vbg); ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); - ok(V_VT(&vDefaultbg) == VT_BSTR, "V_VT(&vDefaultbg) != VT_BSTR\n"); + ok(V_VT(&vbg) == VT_BSTR, "V_VT(&vbg) != VT_BSTR\n"); ok(!strcmp_wa(V_BSTR(&vbg), "#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); VariantClear(&vbg); @@ -6323,7 +6323,7 @@ static void test_table_elem(IHTMLElement *elem) hres = IHTMLTable_get_bgColor(table, &vbg); ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); - ok(V_VT(&vDefaultbg) == VT_BSTR, "V_VT(&vDefaultbg) != VT_BSTR\n"); + ok(V_VT(&vbg) == VT_BSTR, "V_VT(&vbg) != VT_BSTR\n"); ok(!strcmp_wa(V_BSTR(&vbg), "#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); VariantClear(&vbg); @@ -6335,7 +6335,7 @@ static void test_table_elem(IHTMLElement *elem) hres = IHTMLTable_get_bgColor(table, &vbg); ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); - ok(V_VT(&vDefaultbg) == VT_BSTR, "V_VT(&vDefaultbg) != VT_BSTR\n"); + ok(V_VT(&vbg) == VT_BSTR, "V_VT(&vbg) != VT_BSTR\n"); ok(!strcmp_wa(V_BSTR(&vbg), "#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); VariantClear(&vbg);

1 0

Michael Müller : user32: Also set cch member in GetMenuItemInfo when passing a null pointer.
by Alexandre Julliard 09 Sep '14

09 Sep '14

Module: wine Branch: master Commit: 997e197f23144fd53af6fceeec471411996ed6a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=997e197f23144fd53af6fceee… Author: Michael Müller <michael(a)fds-team.de> Date: Sun Sep 7 20:14:36 2014 +0200 user32: Also set cch member in GetMenuItemInfo when passing a null pointer. --- dlls/user32/menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 93bee49..9e05dd4 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4583,12 +4583,12 @@ static BOOL GetMenuItemInfo_common ( HMENU hmenu, UINT item, BOOL bypos, if ((lpmii->fMask & (MIIM_TYPE|MIIM_STRING))) { if( !menu->text ) { if(lpmii->dwTypeData && lpmii->cch) { - lpmii->cch = 0; if( unicode) *((WCHAR *)lpmii->dwTypeData) = 0; else *((CHAR *)lpmii->dwTypeData) = 0; } + lpmii->cch = 0; } else { int len; if (unicode)

1 0