wine-commits May 2015

wine-commits@winehq.org

2 participants
428 discussions

Francois Gouget : ole32/tests: Silence some clipboard traces that generate too many lines.
by Alexandre Julliard 12 May '15

12 May '15

Module: wine Branch: master Commit: 5f35f1a8dbbc9dc3fa629a7f123e045e3320f562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f35f1a8dbbc9dc3fa629a7f1… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 12 12:38:30 2015 +0200 ole32/tests: Silence some clipboard traces that generate too many lines. --- dlls/ole32/tests/clipboard.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index ce469a6..81b3a1c 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -129,7 +129,8 @@ static HRESULT WINAPI EnumFormatImpl_Next(IEnumFORMATETC *iface, ULONG celt, EnumFormatImpl *This = impl_from_IEnumFORMATETC(iface); ULONG count, i; - trace("next: count %d cur %d\n", celt, This->cur); + if (winetest_debug > 1) + trace("next: count %d cur %d\n", celt, This->cur); if(!rgelt) return E_INVALIDARG;

1 0

Francois Gouget : user32/tests: Silence some clipboard traces that generate too many lines.
by Alexandre Julliard 12 May '15

12 May '15

Module: wine Branch: master Commit: 701c399fae5252cd17640170ea92457d9d202cf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=701c399fae5252cd17640170e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 12 12:38:39 2015 +0200 user32/tests: Silence some clipboard traces that generate too many lines. --- dlls/user32/tests/clipboard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 40218be..01dbe93 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -150,8 +150,8 @@ todo_wine if (format_id < 0xc000) ok(!len, "GetClipboardFormatNameA should fail, but it returned %d (%s)\n", len, buf); - else - if (len) trace("%04x: %s\n", format_id, len ? buf : ""); + else if (len && winetest_debug > 1) + trace("%04x: %s\n", format_id, len ? buf : ""); } ret = OpenClipboard(0);

1 0

Francois Gouget : shlwapi/tests: Silence some istream traces that generate too many lines.
by Alexandre Julliard 12 May '15

12 May '15

Module: wine Branch: master Commit: 7411c72e82a1cfbe4794932c185a205161a90c32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7411c72e82a1cfbe4794932c1… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 12 12:38:35 2015 +0200 shlwapi/tests: Silence some istream traces that generate too many lines. --- dlls/shlwapi/tests/istream.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 95485b9..48a292a 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -483,7 +483,8 @@ static void test_SHCreateStreamOnFileEx(DWORD mode, DWORD stgm) static const CHAR testEx_txt[] = "\\testEx.txt"; BOOL delret; - trace("SHCreateStreamOnFileEx: testing mode %d, STGM flags %08x\n", mode, stgm); + if (winetest_debug > 1) + trace("SHCreateStreamOnFileEx: testing mode %d, STGM flags %08x\n", mode, stgm); /* Don't used a fixed path for the testEx.txt file */ GetTempPathA(MAX_PATH, test_fileA);

1 0

Akihiro Sagawa : mciqtz32: Simplify null parameter checks.
by Alexandre Julliard 12 May '15

12 May '15

Module: wine Branch: master Commit: 7d5af1d8896b803c02081221d07ceef80cc3d5b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d5af1d8896b803c02081221d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri May 8 00:37:23 2015 +0900 mciqtz32: Simplify null parameter checks. --- dlls/mciqtz32/mciqtz.c | 38 ++++++-------------------------------- 1 file changed, 6 insertions(+), 32 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 479ae00..413c2f6 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -213,9 +213,6 @@ static DWORD MCIQTZ_mciOpen(UINT wDevID, DWORD dwFlags, TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpOpenParms); - if (!lpOpenParms) - return MCIERR_NULL_PARAMETER_BLOCK; - wma = MCIQTZ_mciGetOpenDev(wDevID); if (!wma) return MCIERR_INVALID_DEVICE_ID; @@ -439,9 +436,6 @@ static DWORD MCIQTZ_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); - if (!lpParms) - return MCIERR_NULL_PARAMETER_BLOCK; - wma = MCIQTZ_mciGetOpenDev(wDevID); if (!wma) return MCIERR_INVALID_DEVICE_ID; @@ -499,9 +493,6 @@ static DWORD MCIQTZ_mciSeek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); - if (!lpParms) - return MCIERR_NULL_PARAMETER_BLOCK; - wma = MCIQTZ_mciGetOpenDev(wDevID); if (!wma) return MCIERR_INVALID_DEVICE_ID; @@ -594,9 +585,6 @@ static DWORD MCIQTZ_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_P TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); - if (!lpParms) - return MCIERR_NULL_PARAMETER_BLOCK; - wma = MCIQTZ_mciGetOpenDev(wDevID); if (!wma) return MCIERR_INVALID_DEVICE_ID; @@ -693,9 +681,6 @@ static DWORD MCIQTZ_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpPar TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); - if (!lpParms) - return MCIERR_NULL_PARAMETER_BLOCK; - wma = MCIQTZ_mciGetOpenDev(wDevID); if (!wma) return MCIERR_INVALID_DEVICE_ID; @@ -750,9 +735,6 @@ static DWORD MCIQTZ_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMS TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); - if (!lpParms) - return MCIERR_NULL_PARAMETER_BLOCK; - wma = MCIQTZ_mciGetOpenDev(wDevID); if (!wma) return MCIERR_INVALID_DEVICE_ID; @@ -853,9 +835,6 @@ static DWORD MCIQTZ_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lp TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); - if (!lpParms) - return MCIERR_NULL_PARAMETER_BLOCK; - wma = MCIQTZ_mciGetOpenDev(wDevID); if (!wma) return MCIERR_INVALID_DEVICE_ID; @@ -918,8 +897,6 @@ static DWORD MCIQTZ_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMS TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); - if (!lpParms) - return MCIERR_NULL_PARAMETER_BLOCK; if (!wma) return MCIERR_INVALID_DEVICE_ID; if (dwFlags & MCI_TEST) @@ -963,9 +940,6 @@ static DWORD MCIQTZ_mciUpdate(UINT wDevID, DWORD dwFlags, LPMCI_DGV_UPDATE_PARMS TRACE("%04x, %08x, %p\n", wDevID, dwFlags, lpParms); - if (!lpParms) - return MCIERR_NULL_PARAMETER_BLOCK; - wma = MCIQTZ_mciGetOpenDev(wDevID); if (!wma) return MCIERR_INVALID_DEVICE_ID; @@ -1027,9 +1001,6 @@ static DWORD MCIQTZ_mciSetAudio(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SETAUDIO_P TRACE("(%04x, %08x, %p)\n", wDevID, dwFlags, lpParms); - if (!lpParms) - return MCIERR_NULL_PARAMETER_BLOCK; - wma = MCIQTZ_mciGetOpenDev(wDevID); if (!wma) return MCIERR_INVALID_DEVICE_ID; @@ -1170,20 +1141,23 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, switch (wMsg) { case MCI_OPEN_DRIVER: - case MCI_CLOSE_DRIVER: case MCI_PLAY: case MCI_SEEK: - case MCI_STOP: - case MCI_PAUSE: case MCI_GETDEVCAPS: case MCI_SET: case MCI_STATUS: case MCI_WHERE: + if (!dwParam2) return MCIERR_NULL_PARAMETER_BLOCK; + return MCIQTZ_relayTaskMessage(dwDevID, wMsg, dwParam1, dwParam2); + case MCI_CLOSE_DRIVER: + case MCI_STOP: + case MCI_PAUSE: return MCIQTZ_relayTaskMessage(dwDevID, wMsg, dwParam1, dwParam2); /* Digital Video specific */ case MCI_SETAUDIO: case MCI_UPDATE: case MCI_WINDOW: + if (!dwParam2) return MCIERR_NULL_PARAMETER_BLOCK; return MCIQTZ_relayTaskMessage(dwDevID, wMsg, dwParam1, dwParam2); case MCI_PUT: case MCI_RECORD:

1 0

Akihiro Sagawa : mciqtz32: Guarantee that CoInitialize and CoUninitialize run on the same thread.
by Alexandre Julliard 12 May '15

12 May '15

Module: wine Branch: master Commit: 46d5973961fe2266074ac2855368c3fcf987c1b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46d5973961fe2266074ac2855… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri May 8 00:37:21 2015 +0900 mciqtz32: Guarantee that CoInitialize and CoUninitialize run on the same thread. --- dlls/mciqtz32/mciqtz.c | 147 ++++++++++++++++++++++++++++++++++++----- dlls/mciqtz32/mciqtz_private.h | 13 ++++ 2 files changed, 145 insertions(+), 15 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index a1c3450..479ae00 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mciqtz); -static DWORD MCIQTZ_mciClose(UINT, DWORD, LPMCI_GENERIC_PARMS); +static DWORD CALLBACK MCIQTZ_taskThread(LPVOID arg); static DWORD MCIQTZ_mciStop(UINT, DWORD, LPMCI_GENERIC_PARMS); /*======================================================================* @@ -67,6 +67,34 @@ static WINE_MCIQTZ* MCIQTZ_mciGetOpenDev(UINT wDevID) return wma; } +/*************************************************************************** + * MCIQTZ_relayTaskMessage [internal] + */ +static LRESULT MCIQTZ_relayTaskMessage(DWORD_PTR dwDevID, UINT wMsg, + DWORD dwFlags, LPARAM lpParms) +{ + WINE_MCIQTZ *wma; + LRESULT res; + TRACE("(%08lX, %08x, %08x, %08lx)\n", dwDevID, wMsg, dwFlags, lpParms); + + wma = MCIQTZ_mciGetOpenDev(dwDevID); + if (!wma) + return MCIERR_INVALID_DEVICE_ID; + EnterCriticalSection(&wma->cs); + wma->task.devid = dwDevID; + wma->task.msg = wMsg; + wma->task.flags = dwFlags; + wma->task.parms = lpParms; + SetEvent(wma->task.notify); + if (WaitForSingleObject(wma->task.done, INFINITE) == WAIT_OBJECT_0) + res = wma->task.res; + else + res = MCIERR_INTERNAL; + LeaveCriticalSection(&wma->cs); + + return res; +} + /************************************************************************** * MCIQTZ_drvOpen [internal] */ @@ -86,12 +114,25 @@ static DWORD MCIQTZ_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) return 0; wma->stop_event = CreateEventW(NULL, FALSE, FALSE, NULL); + wma->task.notify = CreateEventW(NULL, FALSE, FALSE, NULL); + if (!wma->task.notify) goto err; + wma->task.done = CreateEventW(NULL, FALSE, FALSE, NULL); + if (!wma->task.done) goto err; + wma->task.thread = CreateThread(NULL, 0, MCIQTZ_taskThread, &wma->task, 0, NULL); + if (!wma->task.thread) goto err; + InitializeCriticalSection(&wma->cs); + wma->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": WINE_MCIQTZ"); modp->wType = MCI_DEVTYPE_DIGITAL_VIDEO; wma->wDevID = modp->wDeviceID; modp->wCustomCommandTable = wma->command_table = mciLoadCommandResource(MCIQTZ_hInstance, mciAviWStr, 0); mciSetDriverData(wma->wDevID, (DWORD_PTR)wma); return modp->wDeviceID; +err: + if (wma->task.notify) CloseHandle(wma->task.notify); + if (wma->task.done) CloseHandle(wma->task.done); + HeapFree(GetProcessHeap(), 0, wma); + return 0; } /************************************************************************** @@ -107,9 +148,15 @@ static DWORD MCIQTZ_drvClose(DWORD dwDevID) if (wma) { /* finish all outstanding things */ - MCIQTZ_mciClose(dwDevID, MCI_WAIT, NULL); + MCIQTZ_relayTaskMessage(dwDevID, MCI_CLOSE_DRIVER, MCI_WAIT, 0); mciFreeCommandResource(wma->command_table); + MCIQTZ_relayTaskMessage(dwDevID, MCI_CLOSE, MCI_WAIT, 0); + WaitForSingleObject(wma->task.thread, INFINITE); + CloseHandle(wma->task.notify); + CloseHandle(wma->task.done); + CloseHandle(wma->task.thread); + DeleteCriticalSection(&wma->cs); mciSetDriverData(dwDevID, 0); CloseHandle(wma->stop_event); HeapFree(GetProcessHeap(), 0, wma); @@ -1021,6 +1068,76 @@ static DWORD MCIQTZ_mciSetAudio(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SETAUDIO_P return ret; } +/*************************************************************************** + * MCIQTZ_taskThread [internal] + */ +static DWORD CALLBACK MCIQTZ_taskThread(LPVOID arg) +{ + WINE_MCIQTZ_TASK *task = (WINE_MCIQTZ_TASK *)arg; + + for (;;) { + DWORD ret = WaitForSingleObject(task->notify, INFINITE); + if (ret != WAIT_OBJECT_0) { + TRACE("Got error (%u)\n", ret); + continue; + } + + switch (task->msg) { + case MCI_OPEN_DRIVER: + task->res = MCIQTZ_mciOpen(task->devid, task->flags, (LPMCI_DGV_OPEN_PARMSW)task->parms); + break; + case MCI_CLOSE_DRIVER: + task->res = MCIQTZ_mciClose(task->devid, task->flags, (LPMCI_GENERIC_PARMS)task->parms); + break; + case MCI_PLAY: + task->res = MCIQTZ_mciPlay(task->devid, task->flags, (LPMCI_PLAY_PARMS)task->parms); + break; + case MCI_SEEK: + task->res = MCIQTZ_mciSeek(task->devid, task->flags, (LPMCI_SEEK_PARMS)task->parms); + break; + case MCI_STOP: + task->res = MCIQTZ_mciStop(task->devid, task->flags, (LPMCI_GENERIC_PARMS)task->parms); + break; + case MCI_PAUSE: + task->res = MCIQTZ_mciPause(task->devid, task->flags, (LPMCI_GENERIC_PARMS)task->parms); + break; + case MCI_GETDEVCAPS: + task->res = MCIQTZ_mciGetDevCaps(task->devid, task->flags, (LPMCI_GETDEVCAPS_PARMS)task->parms); + break; + case MCI_SET: + task->res = MCIQTZ_mciSet(task->devid, task->flags, (LPMCI_DGV_SET_PARMS)task->parms); + break; + case MCI_STATUS: + task->res = MCIQTZ_mciStatus(task->devid, task->flags, (LPMCI_DGV_STATUS_PARMSW)task->parms); + break; + case MCI_WHERE: + task->res = MCIQTZ_mciWhere(task->devid, task->flags, (LPMCI_DGV_RECT_PARMS)task->parms); + break; + case MCI_SETAUDIO: + task->res = MCIQTZ_mciSetAudio(task->devid, task->flags, (LPMCI_DGV_SETAUDIO_PARMSW)task->parms); + break; + case MCI_UPDATE: + task->res = MCIQTZ_mciUpdate(task->devid, task->flags, (LPMCI_DGV_UPDATE_PARMS)task->parms); + break; + case MCI_WINDOW: + task->res = MCIQTZ_mciWindow(task->devid, task->flags, (LPMCI_DGV_WINDOW_PARMSW)task->parms); + break; + case MCI_CLOSE: + /* Special internal message */ + SetEvent(task->done); + goto end; + default: + FIXME("Shouldn't receive another message (%04x)\n", task->msg); + task->res = MCIERR_UNRECOGNIZED_COMMAND; + break; + } + SetEvent(task->done); + } + +end: + return 0; +} + /*======================================================================* * MCI QTZ entry points * *======================================================================*/ @@ -1052,22 +1169,22 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, return 1; switch (wMsg) { - case MCI_OPEN_DRIVER: return MCIQTZ_mciOpen (dwDevID, dwParam1, (LPMCI_DGV_OPEN_PARMSW) dwParam2); - case MCI_CLOSE_DRIVER: return MCIQTZ_mciClose (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); - case MCI_PLAY: return MCIQTZ_mciPlay (dwDevID, dwParam1, (LPMCI_PLAY_PARMS) dwParam2); - case MCI_SEEK: return MCIQTZ_mciSeek (dwDevID, dwParam1, (LPMCI_SEEK_PARMS) dwParam2); - case MCI_STOP: return MCIQTZ_mciStop (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); - case MCI_PAUSE: return MCIQTZ_mciPause (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); - case MCI_GETDEVCAPS: return MCIQTZ_mciGetDevCaps(dwDevID, dwParam1, (LPMCI_GETDEVCAPS_PARMS) dwParam2); - case MCI_SET: return MCIQTZ_mciSet (dwDevID, dwParam1, (LPMCI_DGV_SET_PARMS) dwParam2); - case MCI_STATUS: return MCIQTZ_mciStatus (dwDevID, dwParam1, (LPMCI_DGV_STATUS_PARMSW) dwParam2); - case MCI_WHERE: return MCIQTZ_mciWhere (dwDevID, dwParam1, (LPMCI_DGV_RECT_PARMS) dwParam2); + case MCI_OPEN_DRIVER: + case MCI_CLOSE_DRIVER: + case MCI_PLAY: + case MCI_SEEK: + case MCI_STOP: + case MCI_PAUSE: + case MCI_GETDEVCAPS: + case MCI_SET: + case MCI_STATUS: + case MCI_WHERE: + return MCIQTZ_relayTaskMessage(dwDevID, wMsg, dwParam1, dwParam2); /* Digital Video specific */ - case MCI_SETAUDIO: return MCIQTZ_mciSetAudio (dwDevID, dwParam1, (LPMCI_DGV_SETAUDIO_PARMSW) dwParam2); + case MCI_SETAUDIO: case MCI_UPDATE: - return MCIQTZ_mciUpdate(dwDevID, dwParam1, (LPMCI_DGV_UPDATE_PARMS)dwParam2); case MCI_WINDOW: - return MCIQTZ_mciWindow(dwDevID, dwParam1, (LPMCI_DGV_WINDOW_PARMSW)dwParam2); + return MCIQTZ_relayTaskMessage(dwDevID, wMsg, dwParam1, dwParam2); case MCI_PUT: case MCI_RECORD: case MCI_RESUME: diff --git a/dlls/mciqtz32/mciqtz_private.h b/dlls/mciqtz32/mciqtz_private.h index 27939aa..6a3ca45 100644 --- a/dlls/mciqtz32/mciqtz_private.h +++ b/dlls/mciqtz32/mciqtz_private.h @@ -26,6 +26,17 @@ #include "dshow.h" typedef struct { + HANDLE thread; + HANDLE notify; + HANDLE done; + DWORD msg; + DWORD_PTR devid; + DWORD flags; + DWORD_PTR parms; + LRESULT res; +} WINE_MCIQTZ_TASK; + +typedef struct { MCIDEVICEID wDevID; BOOL opened; BOOL uninit; @@ -43,6 +54,8 @@ typedef struct { HANDLE callback; HANDLE thread; HANDLE stop_event; + CRITICAL_SECTION cs; + WINE_MCIQTZ_TASK task; } WINE_MCIQTZ; #endif /* __WINE_PRIVATE_MCIQTZ_H */

1 0

André Hentschel : winebuild: Use a 64k page size on ARM64.
by Alexandre Julliard 12 May '15

12 May '15

Module: wine Branch: master Commit: d33f382b29c579e333a23416e2facaab20013fd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d33f382b29c579e333a23416e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 7 23:37:49 2015 +0200 winebuild: Use a 64k page size on ARM64. --- tools/winebuild/utils.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index b9318c3..83eb803 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -931,11 +931,13 @@ unsigned int get_page_size(void) { switch(target_cpu) { - case CPU_x86: return 4096; - case CPU_x86_64: return 4096; - case CPU_POWERPC: return 4096; - case CPU_ARM: return 4096; - case CPU_ARM64: return 4096; + case CPU_x86: + case CPU_x86_64: + case CPU_POWERPC: + case CPU_ARM: + return 0x1000; + case CPU_ARM64: + return 0x10000; } /* unreached */ assert(0);

1 0

Alex Henrie : po: Follow GNU specification for Language and Language-Team headers.
by Alexandre Julliard 12 May '15

12 May '15

1 0

Grazvydas Ignotas : port.h: Make use of compiler support for pointer atomic ops.
by Alexandre Julliard 12 May '15

12 May '15

Module: wine Branch: master Commit: af6066c28892dd08be650e3dcfdd84eb8954e5f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6066c28892dd08be650e3dc… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Tue May 12 03:17:37 2015 +0300 port.h: Make use of compiler support for pointer atomic ops. --- include/wine/port.h | 16 ++++++++++++++++ libs/port/interlocked.c | 6 ++++++ 2 files changed, 22 insertions(+) diff --git a/include/wine/port.h b/include/wine/port.h index 4910f34..2989b39 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -456,8 +456,24 @@ extern int interlocked_xchg_add( int *dest, int incr ); extern int interlocked_xchg( int *dest, int val ); #endif +#if (defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) && __SIZEOF_POINTER__ == 4) \ + || (defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8) && __SIZEOF_POINTER__ == 8) +static inline void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare ) +{ + return __sync_val_compare_and_swap( dest, compare, xchg ); +} + +static inline void *interlocked_xchg_ptr( void **dest, void *val ) +{ + void *ret; + do ret = *dest; while (!__sync_bool_compare_and_swap( dest, ret, val )); + return ret; +} +#else extern void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare ); extern void *interlocked_xchg_ptr( void **dest, void *val ); +#endif + #if defined(__x86_64__) || defined(__aarch64__) || defined(_WIN64) extern unsigned char interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ); diff --git a/libs/port/interlocked.c b/libs/port/interlocked.c index b63c50a..cd6201a 100644 --- a/libs/port/interlocked.c +++ b/libs/port/interlocked.c @@ -289,6 +289,8 @@ int interlocked_cmpxchg( int *dest, int xchg, int compare ) } #endif +#if !(defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) && __SIZEOF_POINTER__ == 4) \ + && !(defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8) && __SIZEOF_POINTER__ == 8) void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare ) { pthread_mutex_lock( &interlocked_mutex ); @@ -301,6 +303,7 @@ void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare ) pthread_mutex_unlock( &interlocked_mutex ); return compare; } +#endif #ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ) @@ -329,6 +332,8 @@ int interlocked_xchg( int *dest, int val ) } #endif +#if !(defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) && __SIZEOF_POINTER__ == 4) \ + && !(defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8) && __SIZEOF_POINTER__ == 8) void *interlocked_xchg_ptr( void **dest, void *val ) { void *retv; @@ -338,6 +343,7 @@ void *interlocked_xchg_ptr( void **dest, void *val ) pthread_mutex_unlock( &interlocked_mutex ); return retv; } +#endif #ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 int interlocked_xchg_add( int *dest, int incr )

1 0

Grazvydas Ignotas : port.h: Make use of compiler support for 64bit atomic ops.
by Alexandre Julliard 12 May '15

12 May '15

Module: wine Branch: master Commit: ae8408f1477837236cec3f278ed75546a20dc7e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae8408f1477837236cec3f278… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Tue May 12 03:17:36 2015 +0300 port.h: Make use of compiler support for 64bit atomic ops. --- include/wine/port.h | 12 +++++++++--- libs/port/interlocked.c | 2 ++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index 16127e0..4910f34 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -367,8 +367,6 @@ extern int _spawnvp(int mode, const char *cmdname, const char * const argv[]); #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) -extern __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ); - static inline int interlocked_cmpxchg( int *dest, int xchg, int compare ) { int ret; @@ -459,7 +457,6 @@ extern int interlocked_xchg( int *dest, int val ); #endif extern void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare ); -extern __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ); extern void *interlocked_xchg_ptr( void **dest, void *val ); #if defined(__x86_64__) || defined(__aarch64__) || defined(_WIN64) extern unsigned char interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high, @@ -468,6 +465,15 @@ extern unsigned char interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high, #endif /* __GNUC__ */ +#ifdef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 +static inline __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ) +{ + return __sync_val_compare_and_swap( dest, compare, xchg ); +} +#else +extern __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ); +#endif + #else /* NO_LIBWINE_PORT */ #define __WINE_NOT_PORTABLE(func) func##_is_not_portable func##_is_not_portable diff --git a/libs/port/interlocked.c b/libs/port/interlocked.c index e5b1bb9..b63c50a 100644 --- a/libs/port/interlocked.c +++ b/libs/port/interlocked.c @@ -302,6 +302,7 @@ void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare ) return compare; } +#ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ) { pthread_mutex_lock( &interlocked_mutex ); @@ -314,6 +315,7 @@ __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ) pthread_mutex_unlock( &interlocked_mutex ); return compare; } +#endif #ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 int interlocked_xchg( int *dest, int val )

1 0

Grazvydas Ignotas : port.h: Make use of compiler support for 32bit atomic ops.
by Alexandre Julliard 12 May '15

12 May '15

Module: wine Branch: master Commit: 4419edd79c152c268a26e63a28923aee755a5a66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4419edd79c152c268a26e63a2… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Tue May 12 03:17:35 2015 +0300 port.h: Make use of compiler support for 32bit atomic ops. --- include/wine/port.h | 24 ++++++++++++++++++++++-- libs/port/interlocked.c | 6 ++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index 3548a44..16127e0 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -435,12 +435,32 @@ static inline unsigned char interlocked_cmpxchg128( __int64 *dest, __int64 xchg_ #else /* __GNUC__ */ +#ifdef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 +static inline int interlocked_cmpxchg( int *dest, int xchg, int compare ) +{ + return __sync_val_compare_and_swap( dest, compare, xchg ); +} + +static inline int interlocked_xchg_add( int *dest, int incr ) +{ + return __sync_fetch_and_add( dest, incr ); +} + +static inline int interlocked_xchg( int *dest, int val ) +{ + int ret; + do ret = *dest; while (!__sync_bool_compare_and_swap( dest, ret, val )); + return ret; +} +#else extern int interlocked_cmpxchg( int *dest, int xchg, int compare ); +extern int interlocked_xchg_add( int *dest, int incr ); +extern int interlocked_xchg( int *dest, int val ); +#endif + extern void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare ); extern __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ); -extern int interlocked_xchg( int *dest, int val ); extern void *interlocked_xchg_ptr( void **dest, void *val ); -extern int interlocked_xchg_add( int *dest, int incr ); #if defined(__x86_64__) || defined(__aarch64__) || defined(_WIN64) extern unsigned char interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ); diff --git a/libs/port/interlocked.c b/libs/port/interlocked.c index f5e405c..e5b1bb9 100644 --- a/libs/port/interlocked.c +++ b/libs/port/interlocked.c @@ -274,6 +274,7 @@ void* interlocked_xchg_ptr( void** dest, void* val ) static pthread_mutex_t interlocked_mutex = PTHREAD_MUTEX_INITIALIZER; +#ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 int interlocked_cmpxchg( int *dest, int xchg, int compare ) { pthread_mutex_lock( &interlocked_mutex ); @@ -286,6 +287,7 @@ int interlocked_cmpxchg( int *dest, int xchg, int compare ) pthread_mutex_unlock( &interlocked_mutex ); return compare; } +#endif void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare ) { @@ -313,6 +315,7 @@ __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ) return compare; } +#ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 int interlocked_xchg( int *dest, int val ) { int retv; @@ -322,6 +325,7 @@ int interlocked_xchg( int *dest, int val ) pthread_mutex_unlock( &interlocked_mutex ); return retv; } +#endif void *interlocked_xchg_ptr( void **dest, void *val ) { @@ -333,6 +337,7 @@ void *interlocked_xchg_ptr( void **dest, void *val ) return retv; } +#ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 int interlocked_xchg_add( int *dest, int incr ) { int retv; @@ -342,6 +347,7 @@ int interlocked_xchg_add( int *dest, int incr ) pthread_mutex_unlock( &interlocked_mutex ); return retv; } +#endif unsigned char interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ) {

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
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