wine-commits May 2015

wine-commits@winehq.org

2 participants
428 discussions

Nikolay Sivov : riched20: Added IDispatch support.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: 81fc69d7e61e129d7de5c63fb773719e765e3b2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=81fc69d7e61e129d7de5c63fb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 24 14:01:38 2015 +0300 riched20: Added IDispatch support. --- dlls/riched20/editor.c | 1 + dlls/riched20/editor.h | 2 + dlls/riched20/richole.c | 300 ++++++++++++++++++++++++++++++++++-------- dlls/riched20/tests/richole.c | 20 ++- 4 files changed, 260 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=81fc69d7e61e129d7de5c…

1 0

Jacek Caban : kernel32: Fixed buffer overflow in GetShortPathNameW.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: 12a134fdc489f1ab23836eae99b500a072db3ae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12a134fdc489f1ab23836eae9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 24 20:16:20 2015 +0200 kernel32: Fixed buffer overflow in GetShortPathNameW. --- dlls/kernel32/path.c | 22 ++++++++++++++++++++-- dlls/kernel32/tests/path.c | 22 ++++++++++++++++++---- 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index eae2ca9..f74b952 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -443,7 +443,7 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl WCHAR *tmpshortpath; LPCWSTR p; DWORD sp = 0, lp = 0; - DWORD tmplen; + DWORD tmplen, buf_len; WIN32_FIND_DATAW wfd; HANDLE goit; @@ -462,7 +462,8 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl /* code below only removes characters from string, never adds, so this is * the largest buffer that tmpshortpath will need to have */ - tmpshortpath = HeapAlloc(GetProcessHeap(), 0, (strlenW(longpath) + 1) * sizeof(WCHAR)); + buf_len = strlenW(longpath) + 1; + tmpshortpath = HeapAlloc(GetProcessHeap(), 0, buf_len * sizeof(WCHAR)); if (!tmpshortpath) { SetLastError(ERROR_OUTOFMEMORY); @@ -524,6 +525,23 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl goit = FindFirstFileW(tmpshortpath, &wfd); if (goit == INVALID_HANDLE_VALUE) goto notfound; FindClose(goit); + + /* In rare cases (like "a.abcd") short path may be longer than original path. + * Make sure we have enough space in temp buffer. */ + if (wfd.cAlternateFileName && tmplen < strlenW(wfd.cAlternateFileName)) + { + WCHAR *new_buf; + buf_len += strlenW(wfd.cAlternateFileName) - tmplen; + new_buf = HeapReAlloc(GetProcessHeap(), 0, tmpshortpath, buf_len * sizeof(WCHAR)); + if(!new_buf) + { + HeapFree(GetProcessHeap(), 0, tmpshortpath); + SetLastError(ERROR_OUTOFMEMORY); + return 0; + } + tmpshortpath = new_buf; + } + strcpyW(tmpshortpath + sp, wfd.cAlternateFileName[0] ? wfd.cAlternateFileName : wfd.cFileName); sp += strlenW(tmpshortpath + sp); lp += tmplen; diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 3bf82fe..f8dfdc8 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1350,7 +1350,8 @@ static void test_GetShortPathNameW(void) static const WCHAR test_path[] = { 'L', 'o', 'n', 'g', 'D', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', 'N', 'a', 'm', 'e', 0 }; static const WCHAR name[] = { 't', 'e', 's', 't', 0 }; static const WCHAR backSlash[] = { '\\', 0 }; - WCHAR path[MAX_PATH], tmppath[MAX_PATH]; + static const WCHAR a_bcdeW[] = {'a','.','b','c','d','e',0}; + WCHAR path[MAX_PATH], tmppath[MAX_PATH], *ptr; WCHAR short_path[MAX_PATH]; DWORD length; HANDLE file; @@ -1387,7 +1388,7 @@ static void test_GetShortPathNameW(void) length = GetShortPathNameW( path, short_path, 0 ); ok( length, "GetShortPathNameW returned 0.\n" ); ret = GetShortPathNameW( path, short_path, length ); - ok( ret, "GetShortPathNameW returned 0.\n" ); + ok( ret && ret == length-1, "GetShortPathNameW returned 0.\n" ); lstrcatW( short_path, name ); @@ -1399,11 +1400,24 @@ static void test_GetShortPathNameW(void) file = CreateFileW( short_path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); ok( file != INVALID_HANDLE_VALUE, "File was not created.\n" ); - - /* End test */ CloseHandle( file ); ret = DeleteFileW( short_path ); ok( ret, "Cannot delete file.\n" ); + + ptr = path + lstrlenW(path); + lstrcpyW( ptr, a_bcdeW); + file = CreateFileW( path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); + ok( file != INVALID_HANDLE_VALUE, "File was not created.\n" ); + CloseHandle( file ); + + length = GetShortPathNameW( path, short_path, sizeof(short_path)/sizeof(*short_path) ); + ok( length, "GetShortPathNameW failed: %u.\n", GetLastError() ); + + ret = DeleteFileW( path ); + ok( ret, "Cannot delete file.\n" ); + *ptr = 0; + + /* End test */ ret = RemoveDirectoryW( path ); ok( ret, "Cannot delete directory.\n" ); }

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: 47319a00287852a6c0c27e7d34f66abaf9c5e8dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=47319a00287852a6c0c27e7d3… Author: Julian Rüger <jr98(a)gmx.net> Date: Sun May 24 19:50:19 2015 +0200 po: Update German translation. --- po/de.po | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/po/de.po b/po/de.po index 357e96d..8f6a548 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-02-24 14:54+0100\n" +"PO-Revision-Date: 2015-05-24 19:47+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -3140,8 +3140,6 @@ msgid "&View Source" msgstr "&Quelltextansicht" #: hhctrl.rc:83 -#, fuzzy -#| msgid "Properties" msgid "Proper&ties" msgstr "&Eigenschaften" @@ -7460,10 +7458,8 @@ msgid "Add Control" msgstr "Steuerelement hinzufügen" #: oledlg.rc:34 -#, fuzzy -#| msgid "&Font..." msgid "&Convert..." -msgstr "Schrift&art..." +msgstr "&Konvertieren..." #: oledlg.rc:33 oleview.rc:40 msgid "&Object" @@ -8593,10 +8589,8 @@ msgid "Duplex:" msgstr "Duplex:" #: wineps.rc:50 -#, fuzzy -#| msgid "&Setup" msgid "Setup" -msgstr "&Einrichten" +msgstr "Einrichten" #: wininet.rc:42 wininet.rc:62 msgid "Realm" @@ -8932,10 +8926,6 @@ msgstr "" "noch besteht." #: winmm.rc:86 -#, fuzzy -#| msgid "" -#| "Cannot find the specified device. Make sure it is installed or that the " -#| "device name is spelled correctly." msgid "" "Cannot find the specified device. Make sure it is installed and that the " "device name is spelled correctly." @@ -9259,24 +9249,20 @@ msgstr "" "noch besteht." #: winmm.rc:136 -#, fuzzy -#| msgid "Wine Mono Installer" msgid "Wine Sound Mapper" -msgstr "Wine-Mono-Installation" +msgstr "Wine-Soundmapper" #: winmm.rc:137 -#, fuzzy -#| msgid "column" msgid "Volume" -msgstr "Spalte" +msgstr "Lautstärke" #: winmm.rc:138 msgid "Master Volume" -msgstr "" +msgstr "Haupt-Lautstärke" #: winmm.rc:139 msgid "Mute" -msgstr "" +msgstr "Stumm" #: winspool.rc:37 msgid "Print to File"

1 0

Nikolay Sivov : dwrite: Fix breakpoint update logic.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: 76577c8e4b3861957bc6165689c3e297b70737eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=76577c8e4b3861957bc616568… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 24 13:53:49 2015 +0300 dwrite: Fix breakpoint update logic. --- dlls/dwrite/layout.c | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 0a95c4e..8ab1ef9 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -366,32 +366,36 @@ static HRESULT layout_update_breakpoints_range(struct dwrite_textlayout *layout, layout->actual_breakpoints = heap_alloc(sizeof(DWRITE_LINE_BREAKPOINT)*layout->len); if (!layout->actual_breakpoints) return E_OUTOFMEMORY; + memcpy(layout->actual_breakpoints, layout->nominal_breakpoints, sizeof(DWRITE_LINE_BREAKPOINT)*layout->len); } - memcpy(layout->actual_breakpoints, layout->nominal_breakpoints, sizeof(DWRITE_LINE_BREAKPOINT)*layout->len); for (i = cur->range.startPosition; i < cur->range.length + cur->range.startPosition; i++) { - UINT32 j = i + cur->range.startPosition; - if (i == 0) { - if (j) - layout->actual_breakpoints[j].breakConditionBefore = layout->actual_breakpoints[j-1].breakConditionAfter = - override_break_condition(layout->actual_breakpoints[j-1].breakConditionAfter, before); + /* for first codepoint check if there's anything before it and update accordingly */ + if (i == cur->range.startPosition) { + if (i > 0) + layout->actual_breakpoints[i].breakConditionBefore = layout->actual_breakpoints[i-1].breakConditionAfter = + override_break_condition(layout->actual_breakpoints[i-1].breakConditionAfter, before); else - layout->actual_breakpoints[j].breakConditionBefore = before; - - layout->actual_breakpoints[j].breakConditionAfter = DWRITE_BREAK_CONDITION_MAY_NOT_BREAK; + layout->actual_breakpoints[i].breakConditionBefore = before; + layout->actual_breakpoints[i].breakConditionAfter = DWRITE_BREAK_CONDITION_MAY_NOT_BREAK; } - - layout->actual_breakpoints[j].isWhitespace = 0; - layout->actual_breakpoints[j].isSoftHyphen = 0; - - if (i == cur->range.length - 1) { - layout->actual_breakpoints[j].breakConditionBefore = DWRITE_BREAK_CONDITION_MAY_NOT_BREAK; - if (j < layout->len - 1) - layout->actual_breakpoints[j].breakConditionAfter = layout->actual_breakpoints[j+1].breakConditionAfter = - override_break_condition(layout->actual_breakpoints[j+1].breakConditionAfter, before); + /* similar check for last codepoint */ + else if (i == cur->range.startPosition + cur->range.length - 1) { + if (i == layout->len - 1) + layout->actual_breakpoints[i].breakConditionAfter = after; else - layout->actual_breakpoints[j].breakConditionAfter = before; + layout->actual_breakpoints[i].breakConditionAfter = layout->actual_breakpoints[i+1].breakConditionBefore = + override_break_condition(layout->actual_breakpoints[i+1].breakConditionBefore, after); + layout->actual_breakpoints[i].breakConditionBefore = DWRITE_BREAK_CONDITION_MAY_NOT_BREAK; } + /* for all positions within a range disable breaks */ + else { + layout->actual_breakpoints[i].breakConditionBefore = DWRITE_BREAK_CONDITION_MAY_NOT_BREAK; + layout->actual_breakpoints[i].breakConditionAfter = DWRITE_BREAK_CONDITION_MAY_NOT_BREAK; + } + + layout->actual_breakpoints[i].isWhitespace = FALSE; + layout->actual_breakpoints[i].isSoftHyphen = FALSE; } return S_OK;

1 0

Nikolay Sivov : dxdiagn: Silence some fixmes from class factory QI.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: 0491ad58737ddbd458260690911a5b5811826c32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0491ad58737ddbd4582606909… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 7 11:24:15 2015 +0300 dxdiagn: Silence some fixmes from class factory QI. --- dlls/dxdiagn/dxdiag_main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dxdiagn/dxdiag_main.c b/dlls/dxdiagn/dxdiag_main.c index 0745df6..e034b4e 100644 --- a/dlls/dxdiagn/dxdiag_main.c +++ b/dlls/dxdiagn/dxdiag_main.c @@ -67,6 +67,12 @@ static HRESULT WINAPI DXDiagCF_QueryInterface(IClassFactory *iface, REFIID riid, TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); else if (IsEqualGUID(&IID_IClassFactory, riid)) TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + else if (IsEqualGUID(&IID_IExternalConnection, riid) || + IsEqualGUID(&IID_IMarshal, riid)) { + TRACE("(%p)->(%s) ignoring\n", iface, debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } else { FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); *ppv = NULL;

1 0

Francois Gouget : include: Add more interfaces to ctfutb.idl.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: 7da2416e77cb9c9466887a1575759d835ce16b67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7da2416e77cb9c9466887a157… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 23 17:17:55 2015 +0200 include: Add more interfaces to ctfutb.idl. --- include/ctfutb.idl | 155 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 154 insertions(+), 1 deletion(-) diff --git a/include/ctfutb.idl b/include/ctfutb.idl index 6d80b38..1a4125b 100644 --- a/include/ctfutb.idl +++ b/include/ctfutb.idl @@ -24,6 +24,128 @@ interface ITfLangBarEventSink; interface ITfLangBarItemMgr; interface ITfInputProcessorProfiles; +const ULONG TF_LBI_DESC_MAXLEN = 32; + +typedef [uuid(12a1d29f-a065-440c-9746-eb2002c8bd19)] struct TF_LANGBARITEMINFO +{ + CLSID clsidService; + GUID guidItem; + DWORD dwStyle; + ULONG ulSort; + WCHAR szDescription[TF_LBI_DESC_MAXLEN]; +} TF_LANGBARITEMINFO; + +[ + object, + uuid(73540d69-edeb-4ee9-96c9-23aa30b25916), + pointer_default(unique), +] +interface ITfLangBarItem : IUnknown +{ + HRESULT GetInfo( + [out] TF_LANGBARITEMINFO *pInfo); + + HRESULT GetStatus( + [out] DWORD *pdwStatus); + + HRESULT Show( + [in] BOOL fShow); + + HRESULT GetTooltipString( + [out] BSTR *pbstrToolTip); +} + +[ + object, + uuid(583f34d0-de25-11d2-afdd-00105a2799b5), + pointer_default(unique), +] +interface IEnumTfLangBarItems : IUnknown +{ + HRESULT Clone( + [out] IEnumTfLangBarItems **ppEnum); + + HRESULT Next( + [in] ULONG ulCount, + [out, size_is(ulCount)] ITfLangBarItem **ppItem, + [in, out, unique] ULONG *pcFetched); + + HRESULT Reset(); + + HRESULT Skip( + [in] ULONG ulCount); +} + +[ + object, + uuid(57dbe1a0-de25-11d2-afdd-00105a2799b5), + pointer_default(unique), +] +interface ITfLangBarItemSink : IUnknown +{ + HRESULT OnUpdate( + [in] DWORD dwFlags); +} + +[ + object, + uuid(ba468c55-9956-4fb1-a59d-52a7dd7cc6aa), + pointer_default(unique), +] +interface ITfLangBarItemMgr : IUnknown +{ + HRESULT EnumItems( + [out] IEnumTfLangBarItems **ppEnum); + + HRESULT GetItem( + [in] REFGUID rguid, + [out] ITfLangBarItem **ppItem); + + HRESULT AddItem( + [in] ITfLangBarItem *punk); + + HRESULT RemoveItem( + [in] ITfLangBarItem *punk); + + HRESULT AdviseItemSink( + [in] ITfLangBarItemSink *punk, + [out] DWORD *pdwCookie, + [in] REFGUID rguidItem); + + HRESULT UnadviseItemSink( + [in] DWORD dwCookie); + + HRESULT GetItemFloatingRect( + [in] DWORD dwThreadId, + [in] REFGUID rguid, + [out] RECT *prc); + + HRESULT GetItemsStatus( + [in] ULONG ulCount, + [in, size_is(ulCount)] const GUID *prgguid, + [out, size_is(ulCount)] DWORD *pdwStatus); + + HRESULT GetItemNum( + [out] ULONG *pulCount); + + HRESULT GetItems( + [in] ULONG ulCount, + [out, size_is(ulCount), length_is(*pcFetched)] ITfLangBarItem **ppItem, + [out, size_is(ulCount), length_is(*pcFetched)] TF_LANGBARITEMINFO *pInfo, + [out, size_is(ulCount), length_is(*pcFetched)] DWORD *pdwStatus, + [in, out, unique] ULONG *pcFetched); + + HRESULT AdviseItemsSink( + [in] ULONG ulCount, + [in, size_is(ulCount)] ITfLangBarItemSink **ppunk, + [in, size_is(ulCount)] const GUID *pguidItem, + [out, size_is(ulCount)] DWORD *pdwCookie); + + HRESULT UnadviseItemsSink( + [in] ULONG ulCount, + [in, size_is(ulCount)] DWORD *pdwCookie); +} + [ object, uuid(87955690-e627-11d2-8ddb-00105a2799b5), @@ -70,4 +192,35 @@ interface ITfLangBarMgr: IUnknown HRESULT GetShowFloatingStatus( [out] DWORD *pdwFlags); -}; +} + +[ + object, + uuid(18a4e900-e0ae-11d2-afdd-00105a2799b5), + pointer_default(unique) +] +interface ITfLangBarEventSink: IUnknown +{ + HRESULT OnSetFocus( + [in] DWORD dwThreadId); + + HRESULT OnThreadTerminate( + [in] DWORD dwThreadId); + + HRESULT OnThreadItemChange( + [in] DWORD dwThreadId); + + HRESULT OnModalInput( + [in] DWORD dwThreadId, + [in] UINT uMsg, + [in] WPARAM wParam, + [in] LPARAM lParam); + + HRESULT ShowFloating( + [in] DWORD dwFlags); + + HRESULT GetItemFloatingRect( + [in] DWORD dwThreadId, + [in] REFGUID rguid, + [out] RECT *prc); +}

1 0

Francois Gouget : include: Remove an unneeded include directive from msctf.idl.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: 3b6ca071d0c8e58e6d39dbff59dcb975e6ee8b14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b6ca071d0c8e58e6d39dbff5… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 23 17:06:45 2015 +0200 include: Remove an unneeded include directive from msctf.idl. --- include/msctf.idl | 1 - 1 file changed, 1 deletion(-) diff --git a/include/msctf.idl b/include/msctf.idl index 0e2b8b4..db82709 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -22,7 +22,6 @@ import "comcat.idl"; import "textstor.idl"; import "ctfutb.idl"; #endif -cpp_quote("#include <winuser.h>") cpp_quote("#define TF_E_STACKFULL MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0501)") cpp_quote("#define TF_E_DISCONNECTED MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0504)")

1 0

Francois Gouget : msvcp90: Make call_once_func_wrapper() static.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: 79378304b61561757a09ee54b37137b454a714dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=79378304b61561757a09ee54b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 23 17:04:57 2015 +0200 msvcp90: Make call_once_func_wrapper() static. --- dlls/msvcp90/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index c8bb2bd..145e4dc 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -653,7 +653,7 @@ void __cdecl _Call_onceEx(int *once, void (__cdecl *func)(void*), void *argv) LeaveCriticalSection(&call_once_cs); } -void __cdecl call_once_func_wrapper(void *func) +static void __cdecl call_once_func_wrapper(void *func) { ((void (__cdecl*)(void))func)(); }

1 0

Francois Gouget : msvcp120/tests: Make call_once(_ex)?_thread() static.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: 13595fd35f53fdf90ddc9b9b7e350327e5f87790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13595fd35f53fdf90ddc9b9b7… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 23 17:04:50 2015 +0200 msvcp120/tests: Make call_once(_ex)?_thread() static. --- dlls/msvcp120/tests/msvcp120.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index b5b4301..5db2fa0 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -213,13 +213,13 @@ static void __cdecl call_once_ex_func(void *arg) (*i)++; } -DWORD WINAPI call_once_thread(void *arg) +static DWORD WINAPI call_once_thread(void *arg) { p__Call_once(&once, call_once_func); return 0; } -DWORD WINAPI call_once_ex_thread(void *arg) +static DWORD WINAPI call_once_ex_thread(void *arg) { p__Call_onceEx(&once, call_once_ex_func, &cnt); return 0;

1 0

Francois Gouget : kernel32/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: 8efa0fb0c4cf263c5449037e18f8e2d846d73b9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8efa0fb0c4cf263c5449037e1… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 23 13:53:06 2015 +0200 kernel32/tests: Fix compilation on systems that don't support nameless unions. --- dlls/kernel32/tests/time.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index d205174..0bcde1e 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -765,8 +765,8 @@ static void test_GetDynamicTimeZoneInformation(void) static ULONGLONG get_longlong_time(FILETIME *time) { ULARGE_INTEGER uli; - uli.LowPart = time->dwLowDateTime; - uli.HighPart = time->dwHighDateTime; + uli.u.LowPart = time->dwLowDateTime; + uli.u.HighPart = time->dwHighDateTime; return uli.QuadPart; }

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2015