wine-commits June 2017

wine-commits@winehq.org

2 participants
595 discussions

Nikolay Sivov : regedit: Remove explicit iIndent field initialization.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: f4e98d813fa483a7156a8c68237523b878ea8463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4e98d813fa483a7156a8c682… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 28 15:49:55 2017 +0300 regedit: Remove explicit iIndent field initialization. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 4be7c94..c59d435 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -153,8 +153,8 @@ void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD siz int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount, int pos) { + LVITEMW item = { 0 }; LINE_INFO* linfo; - LVITEMW item; int index; linfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LINE_INFO) + dwCount); @@ -173,8 +173,6 @@ int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWOR item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; item.iItem = (pos == -1) ? SendMessageW(hwndLV, LVM_GETITEMCOUNT, 0, 0) : pos; - item.iSubItem = 0; - item.state = 0; item.stateMask = LVIS_FOCUSED | LVIS_SELECTED; item.pszText = Name ? Name : LPSTR_TEXTCALLBACKW; item.cchTextMax = Name ? lstrlenW(item.pszText) : 0; @@ -192,10 +190,6 @@ int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWOR } item.lParam = (LPARAM)linfo; -#if (_WIN32_IE >= 0x0300) - item.iIndent = 0; -#endif - if ((index = ListView_InsertItemW(hwndLV, &item)) != -1) format_value_data(hwndLV, index, dwValType, ValBuf, dwCount); return index;

1 0

Nikolay Sivov : regedit: Use notification message to clean up item data.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: b84f228805f3cf121ee2e91b155ef077b092520f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b84f228805f3cf121ee2e91b1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 28 15:49:54 2017 +0300 regedit: Use notification message to clean up item data. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index b758564..4be7c94 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -411,6 +411,14 @@ static LRESULT CALLBACK ListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR HeapFree(GetProcessHeap(), 0, oldName); return 0; } + case LVN_DELETEITEM: { + NMLISTVIEW *nmlv = (NMLISTVIEW *)lParam; + LINE_INFO *info = (LINE_INFO *)nmlv->lParam; + + HeapFree(GetProcessHeap(), 0, info->name); + HeapFree(GetProcessHeap(), 0, info); + } + break; case NM_RETURN: { int cnt = SendMessageW(hWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_FOCUSED | LVNI_SELECTED, 0)); if (cnt != -1) @@ -515,7 +523,6 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highli BYTE* valBuf = 0; HKEY hKey = 0; LONG errCode; - INT count, i; LVITEMW item; if (!hwndLV) return FALSE; @@ -525,16 +532,8 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highli errCode = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ, &hKey); if (errCode != ERROR_SUCCESS) goto done; - count = SendMessageW(hwndLV, LVM_GETITEMCOUNT, 0, 0); - for (i = 0; i < count; i++) { - item.mask = LVIF_PARAM; - item.iItem = i; - SendMessageW( hwndLV, LVM_GETITEMW, 0, (LPARAM)&item ); - HeapFree(GetProcessHeap(), 0, ((LINE_INFO*)item.lParam)->name); - HeapFree(GetProcessHeap(), 0, (void*)item.lParam); - } g_columnToSort = ~0U; - SendMessageW( hwndLV, LVM_DELETEALLITEMS, 0, 0L ); + SendMessageW(hwndLV, LVM_DELETEALLITEMS, 0, 0); /* get size information and resize the buffers if necessary */ errCode = RegQueryInfoKeyW(hKey, NULL, NULL, NULL, NULL, &max_sub_key_len, NULL,

1 0

Hugh McMaster : regedit: Free the binary data buffer after saving the new value (Coverity).
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: b25337e6d6b7bfc9717d2c66f7c9b0b01a04929f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b25337e6d6b7bfc9717d2c66f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 28 10:47:29 2017 +0000 regedit: Free the binary data buffer after saving the new value (Coverity). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 403def4..2c47bdc 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -165,6 +165,7 @@ static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wPara { SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, (WPARAM)cbData, (LPARAM)pData); lRet = RegSetValueExW(params->hKey, params->lpszValueName, 0, REG_BINARY, pData, cbData); + HeapFree(GetProcessHeap(), 0, pData); } else lRet = ERROR_OUTOFMEMORY;

1 0

Alistair Leslie-Hughes : dmime: Support more interfaces in IDirectMusicAudioPath.GetObjectInPath.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: f62a891385f3f58925787283254171f2a25e215d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f62a891385f3f589257872832… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 28 10:50:52 2017 +0000 dmime: Support more interfaces in IDirectMusicAudioPath.GetObjectInPath. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/audiopath.c | 21 ++++++++++----------- dlls/dmime/tests/dmime.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 11 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index 04f0af0..cc7e4d1 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -137,17 +137,16 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud case DMUS_PATH_BUFFER: if (This->pDSBuffer) { - if (IsEqualIID (iidInterface, &IID_IDirectSoundBuffer8)) { - IDirectSoundBuffer8_QueryInterface (This->pDSBuffer, &IID_IDirectSoundBuffer8, ppObject); - TRACE("returning %p\n",*ppObject); - return S_OK; - } else if (IsEqualIID (iidInterface, &IID_IDirectSound3DBuffer)) { - IDirectSoundBuffer8_QueryInterface (This->pDSBuffer, &IID_IDirectSound3DBuffer, ppObject); - TRACE("returning %p\n",*ppObject); - return S_OK; - } else { - FIXME("Bad iid\n"); - } + if (IsEqualIID (iidInterface, &IID_IUnknown) || + IsEqualIID (iidInterface, &IID_IDirectSoundBuffer) || + IsEqualIID (iidInterface, &IID_IDirectSoundBuffer8) || + IsEqualIID (iidInterface, &IID_IDirectSound3DBuffer)) { + return IDirectSoundBuffer8_QueryInterface (This->pDSBuffer, iidInterface, ppObject); + } + + WARN("Unsupported interface %s\n", debugstr_dmguid(iidInterface)); + *ppObject = NULL; + return E_NOINTERFACE; } break; diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index a154eac..62a977e 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -23,6 +23,7 @@ #include <wine/test.h> #include <dmusici.h> #include <audioclient.h> +#include <guiddef.h> #define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) @@ -45,8 +46,14 @@ static void test_COM_audiopath(void) IDirectMusicAudioPath *dmap; IUnknown *unk; IDirectMusicPerformance8 *performance; + IDirectSoundBuffer *dsound; + IDirectSoundBuffer8 *dsound8; + IDirectSoundNotify *notify; + IDirectSound3DBuffer *dsound3d; + IKsPropertySet *propset; ULONG refcount; HRESULT hr; + DWORD buffer = 0; hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, (void**)&performance); @@ -89,6 +96,39 @@ static void test_COM_audiopath(void) ok(refcount == 5, "refcount == %u, expected 5\n", refcount); refcount = IUnknown_Release(unk); + hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, + 0, &IID_IDirectSoundBuffer, (void**)&dsound); + ok(hr == S_OK, "Failed: %08x\n", hr); + IDirectSoundBuffer_Release(dsound); + + hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, + 0, &IID_IDirectSoundBuffer8, (void**)&dsound8); + ok(hr == S_OK, "Failed: %08x\n", hr); + IDirectSoundBuffer8_Release(dsound8); + + hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, + 0, &IID_IDirectSoundNotify, (void**)&notify); + ok(hr == E_NOINTERFACE, "Failed: %08x\n", hr); + + hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, + 0, &IID_IDirectSound3DBuffer, (void**)&dsound3d); + ok(hr == E_NOINTERFACE, "Failed: %08x\n", hr); + + hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, + 0, &IID_IKsPropertySet, (void**)&propset); + todo_wine ok(hr == S_OK, "Failed: %08x\n", hr); + if (propset) + IKsPropertySet_Release(propset); + + hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, + 0, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "Failed: %08x\n", hr); + IUnknown_Release(unk); + + hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, + 0, &GUID_NULL, (void**)&unk); + ok(hr == E_NOINTERFACE, "Failed: %08x\n", hr); + while (IDirectMusicAudioPath_Release(dmap) > 1); /* performance has a reference too */ IDirectMusicPerformance8_CloseDown(performance); IDirectMusicPerformance8_Release(performance);

1 0

Huw Davies : msvcrt: _difftime64() takes 64-bit args.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: b7bb360be363cca4ca14dbf88dfdbe8cd6621df6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7bb360be363cca4ca14dbf88… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 28 13:49:58 2017 +0100 msvcrt: _difftime64() takes 64-bit args. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec index 6cd46b4..db36c29 100644 --- a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec +++ b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec @@ -15,7 +15,7 @@ @ cdecl _ctime64(ptr) ucrtbase._ctime64 @ cdecl _ctime64_s(str long ptr) ucrtbase._ctime64_s @ cdecl _difftime32(long long) ucrtbase._difftime32 -@ cdecl _difftime64(long long) ucrtbase._difftime64 +@ cdecl _difftime64(int64 int64) ucrtbase._difftime64 @ cdecl _ftime32(ptr) ucrtbase._ftime32 @ cdecl _ftime32_s(ptr) ucrtbase._ftime32_s @ cdecl _ftime64(ptr) ucrtbase._ftime64 diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 964f600..fcf235a 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -768,7 +768,7 @@ @ varargs _cwscanf_s_l(wstr ptr) @ extern _daylight MSVCRT___daylight @ cdecl _difftime32(long long) MSVCRT__difftime32 -@ cdecl _difftime64(long long) MSVCRT__difftime64 +@ cdecl _difftime64(int64 int64) MSVCRT__difftime64 @ stub _dosmaperr @ extern _dstbias MSVCRT__dstbias @ cdecl _dup(long) MSVCRT__dup diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index b2c5745..e0b7761 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1116,7 +1116,7 @@ @ varargs _cwscanf_s_l(wstr ptr) @ extern _daylight MSVCRT___daylight @ cdecl _difftime32(long long) MSVCRT__difftime32 -@ cdecl _difftime64(long long) MSVCRT__difftime64 +@ cdecl _difftime64(int64 int64) MSVCRT__difftime64 @ stub _dosmaperr @ extern _dstbias MSVCRT__dstbias @ cdecl _dup(long) MSVCRT__dup diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index d6f2110..5a2f9c9 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1108,7 +1108,7 @@ @ extern _daylight MSVCRT___daylight @ cdecl _dclass(double) MSVCR120__dclass @ cdecl _difftime32(long long) MSVCRT__difftime32 -@ cdecl _difftime64(long long) MSVCRT__difftime64 +@ cdecl _difftime64(int64 int64) MSVCRT__difftime64 @ stub _dosmaperr @ cdecl _dpcomp(double double) MSVCR120__dpcomp @ cdecl _dsign(double) MSVCR120__dsign diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 4bb1afb..5c6093c 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1047,7 +1047,7 @@ @ extern _daylight msvcr120._daylight @ cdecl _dclass(double) msvcr120._dclass @ cdecl _difftime32(long long) msvcr120._difftime32 -@ cdecl _difftime64(long long) msvcr120._difftime64 +@ cdecl _difftime64(int64 int64) msvcr120._difftime64 @ stub _dosmaperr @ cdecl _dpcomp(double double) msvcr120._dpcomp @ cdecl _dsign(double) msvcr120._dsign diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index de945d5..6c3c33c 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -433,7 +433,7 @@ @ extern _daylight MSVCRT___daylight @ cdecl _decode_pointer(ptr) MSVCRT_decode_pointer @ cdecl _difftime32(long long) MSVCRT__difftime32 -@ cdecl _difftime64(long long) MSVCRT__difftime64 +@ cdecl _difftime64(int64 int64) MSVCRT__difftime64 @ stub _dosmaperr @ extern _dstbias MSVCRT__dstbias @ cdecl _dup(long) MSVCRT__dup diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 8b4a77c..d0ce271 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -416,7 +416,7 @@ @ extern _daylight MSVCRT___daylight @ cdecl _decode_pointer(ptr) MSVCRT_decode_pointer @ cdecl _difftime32(long long) MSVCRT__difftime32 -@ cdecl _difftime64(long long) MSVCRT__difftime64 +@ cdecl _difftime64(int64 int64) MSVCRT__difftime64 @ stub _dosmaperr @ extern _dstbias MSVCRT__dstbias @ cdecl _dup(long) MSVCRT__dup diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 1a887d3..e2b72e8 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -403,7 +403,7 @@ @ varargs _cwscanf_s_l(wstr ptr) @ extern _daylight MSVCRT___daylight @ cdecl _difftime32(long long) MSVCRT__difftime32 -@ cdecl _difftime64(long long) MSVCRT__difftime64 +@ cdecl _difftime64(int64 int64) MSVCRT__difftime64 @ extern _dstbias MSVCRT__dstbias @ cdecl _dup (long) MSVCRT__dup @ cdecl _dup2 (long long) MSVCRT__dup2 diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 78ae7d6..5d13712 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -252,7 +252,7 @@ @ cdecl _dclass(double) MSVCR120__dclass @ stub _dexp @ cdecl _difftime32(long long) MSVCRT__difftime32 -@ cdecl _difftime64(long long) MSVCRT__difftime64 +@ cdecl _difftime64(int64 int64) MSVCRT__difftime64 @ stub _dlog @ stub _dnorm @ cdecl _dpcomp(double double) MSVCR120__dpcomp

1 0

Huw Davies : wineandroid: Use logical co-ords to call GdiAlphaBlend().
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 99069934f735fe57978b011f8a57792638de5047 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99069934f735fe57978b011f8… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 27 16:40:38 2017 +0100 wineandroid: Use logical co-ords to call GdiAlphaBlend(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/window.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index f7a13df..ff8b1e0 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -1247,7 +1247,7 @@ BOOL CDECL ANDROID_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *bmi = (BITMAPINFO *)buffer; void *src_bits, *dst_bits; - RECT rect; + RECT rect, src_rect; HDC hdc = 0; HBITMAP dib; BOOL ret = FALSE; @@ -1297,11 +1297,13 @@ BOOL CDECL ANDROID_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO memcpy( src_bits, dst_bits, bmi->bmiHeader.biSizeImage ); PatBlt( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, BLACKNESS ); } + src_rect = rect; + if (info->pptSrc) OffsetRect( &src_rect, info->pptSrc->x, info->pptSrc->y ); + DPtoLP( info->hdcSrc, (POINT *)&src_rect, 2 ); + ret = GdiAlphaBlend( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, - info->hdcSrc, - rect.left + (info->pptSrc ? info->pptSrc->x : 0), - rect.top + (info->pptSrc ? info->pptSrc->y : 0), - rect.right - rect.left, rect.bottom - rect.top, + info->hdcSrc, src_rect.left, src_rect.top, + src_rect.right - src_rect.left, src_rect.bottom - src_rect.top, (info->dwFlags & ULW_ALPHA) ? *info->pblend : blend ); if (ret) {

1 0

Huw Davies : winex11: Use logical co-ords to call GdiAlphaBlend().
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: daae0d6adc5dca126c43a143c460d1bb66336be3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daae0d6adc5dca126c43a143c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 27 16:40:36 2017 +0100 winex11: Use logical co-ords to call GdiAlphaBlend(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index ea4933f..eaf6dcf 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2583,7 +2583,7 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *bmi = (BITMAPINFO *)buffer; void *src_bits, *dst_bits; - RECT rect; + RECT rect, src_rect; HDC hdc = 0; HBITMAP dib; BOOL ret = FALSE; @@ -2631,11 +2631,13 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO memcpy( src_bits, dst_bits, bmi->bmiHeader.biSizeImage ); PatBlt( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, BLACKNESS ); } + src_rect = rect; + if (info->pptSrc) OffsetRect( &src_rect, info->pptSrc->x, info->pptSrc->y ); + DPtoLP( info->hdcSrc, (POINT *)&src_rect, 2 ); + ret = GdiAlphaBlend( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, - info->hdcSrc, - rect.left + (info->pptSrc ? info->pptSrc->x : 0), - rect.top + (info->pptSrc ? info->pptSrc->y : 0), - rect.right - rect.left, rect.bottom - rect.top, + info->hdcSrc, src_rect.left, src_rect.top, + src_rect.right - src_rect.left, src_rect.bottom - src_rect.top, (info->dwFlags & ULW_ALPHA) ? *info->pblend : blend ); if (ret) {

1 0

Jacek Caban : server: Remove no longer needed need_handle from queue_irp.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 84bc9c3d56225d0bdd9f4bbc76986ef4ef83e22c URL: http://source.winehq.org/git/wine.git/?a=commit;h=84bc9c3d56225d0bdd9f4bbc7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 12:20:27 2017 +0200 server: Remove no longer needed need_handle from queue_irp. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/server/device.c b/server/device.c index cf405b8..fc5bcbe 100644 --- a/server/device.c +++ b/server/device.c @@ -462,22 +462,14 @@ static void set_file_user_ptr( struct device_file *file, client_ptr_t ptr ) } /* queue an irp to the device */ -static obj_handle_t queue_irp( struct device_file *file, struct irp_call *irp, struct async *async, int need_handle ) +static int queue_irp( struct device_file *file, struct irp_call *irp, struct async *async ) { - obj_handle_t handle = 0; + if (!fd_queue_async( file->fd, async, ASYNC_TYPE_WAIT )) return 0; - if (!need_handle) handle = 1; - else if (async_is_blocking( async ) && !(handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ))) return 0; - - if (!fd_queue_async( file->fd, async, ASYNC_TYPE_WAIT )) - { - if (need_handle && handle) close_handle( current->process, handle ); - return 0; - } irp->async = (struct async *)grab_object( async ); add_irp_to_queue( file, irp, current ); set_error( STATUS_PENDING ); - return handle; + return 1; } static enum server_fd_type device_file_get_fd_type( struct fd *fd ) @@ -501,7 +493,7 @@ static int device_file_read( struct fd *fd, struct async *async, file_pos_t pos irp = create_irp( file, &params, async ); if (!irp) return 0; - handle = queue_irp( file, irp, async, 0 ); + handle = queue_irp( file, irp, async ); release_object( irp ); return handle; } @@ -522,7 +514,7 @@ static int device_file_write( struct fd *fd, struct async *async, file_pos_t pos irp = create_irp( file, &params, async ); if (!irp) return 0; - handle = queue_irp( file, irp, async, 0 ); + handle = queue_irp( file, irp, async ); release_object( irp ); return handle; } @@ -541,7 +533,7 @@ static int device_file_flush( struct fd *fd, struct async *async ) irp = create_irp( file, &params, NULL ); if (!irp) return 0; - handle = queue_irp( file, irp, async, 0 ); + handle = queue_irp( file, irp, async ); release_object( irp ); return handle; } @@ -561,7 +553,7 @@ static int device_file_ioctl( struct fd *fd, ioctl_code_t code, struct async *as irp = create_irp( file, &params, async ); if (!irp) return 0; - handle = queue_irp( file, irp, async, 0 ); + handle = queue_irp( file, irp, async ); release_object( irp ); return handle; }

1 0

Jacek Caban : server: Use create_request_async in flush request handler.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 10c1f245e45a387046e2075e3a74dc3b450d47d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10c1f245e45a387046e2075e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 12:20:20 2017 +0200 server: Use create_request_async in flush request handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 1 - server/device.c | 6 +++--- server/fd.c | 7 +++---- server/file.c | 12 ++++++++---- server/file.h | 4 ++-- server/named_pipe.c | 25 +++++++++++-------------- 6 files changed, 27 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 380b370..0381e55 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3424,7 +3424,6 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE hFile, IO_STATUS_BLOCK* IoStatusBlock if (hEvent) { NtWaitForSingleObject( hEvent, FALSE, NULL ); - NtClose( hEvent ); ret = STATUS_SUCCESS; } } diff --git a/server/device.c b/server/device.c index c19905b..cf405b8 100644 --- a/server/device.c +++ b/server/device.c @@ -176,7 +176,7 @@ static void device_file_destroy( struct object *obj ); static enum server_fd_type device_file_get_fd_type( struct fd *fd ); static int device_file_read( struct fd *fd, struct async *async, file_pos_t pos ); static int device_file_write( struct fd *fd, struct async *async, file_pos_t pos ); -static obj_handle_t device_file_flush( struct fd *fd, struct async *async ); +static int device_file_flush( struct fd *fd, struct async *async ); static int device_file_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static const struct object_ops device_file_ops = @@ -527,7 +527,7 @@ static int device_file_write( struct fd *fd, struct async *async, file_pos_t pos return handle; } -static obj_handle_t device_file_flush( struct fd *fd, struct async *async ) +static int device_file_flush( struct fd *fd, struct async *async ) { struct device_file *file = get_fd_user( fd ); struct irp_call *irp; @@ -541,7 +541,7 @@ static obj_handle_t device_file_flush( struct fd *fd, struct async *async ) irp = create_irp( file, &params, NULL ); if (!irp) return 0; - handle = queue_irp( file, irp, async, 1 ); + handle = queue_irp( file, irp, async, 0 ); release_object( irp ); return handle; } diff --git a/server/fd.c b/server/fd.c index 5ab0ff0..f64c8c9 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2172,7 +2172,7 @@ int no_fd_write( struct fd *fd, struct async *async, file_pos_t pos ) } /* default flush() routine */ -obj_handle_t no_fd_flush( struct fd *fd, struct async *async ) +int no_fd_flush( struct fd *fd, struct async *async ) { set_error( STATUS_OBJECT_TYPE_MISMATCH ); return 0; @@ -2373,10 +2373,9 @@ DECL_HANDLER(flush) if (!fd) return; - async = create_async( fd, current, &req->async, NULL ); - if (async) + if ((async = create_request_async( fd, &req->async ))) { - reply->event = fd->fd_ops->flush( fd, async ); + reply->event = async_handoff( async, fd->fd_ops->flush( fd, async ), NULL ); release_object( async ); } release_object( fd ); diff --git a/server/file.c b/server/file.c index 341c3c8..3809012 100644 --- a/server/file.c +++ b/server/file.c @@ -74,7 +74,7 @@ static struct object *file_open_file( struct object *obj, unsigned int access, static void file_destroy( struct object *obj ); static int file_get_poll_events( struct fd *fd ); -static obj_handle_t file_flush( struct fd *fd, struct async *async ); +static int file_flush( struct fd *fd, struct async *async ); static enum server_fd_type file_get_fd_type( struct fd *fd ); static const struct object_ops file_ops = @@ -295,11 +295,15 @@ static int file_get_poll_events( struct fd *fd ) return events; } -static obj_handle_t file_flush( struct fd *fd, struct async *async ) +static int file_flush( struct fd *fd, struct async *async ) { int unix_fd = get_unix_fd( fd ); - if (unix_fd != -1 && fsync( unix_fd ) == -1) file_set_error(); - return 0; + if (unix_fd != -1 && fsync( unix_fd ) == -1) + { + file_set_error(); + return 0; + } + return 1; } static enum server_fd_type file_get_fd_type( struct fd *fd ) diff --git a/server/file.h b/server/file.h index 0dbf8d4..386f76c 100644 --- a/server/file.h +++ b/server/file.h @@ -56,7 +56,7 @@ struct fd_ops /* perform a write on the file */ int (*write)(struct fd *, struct async *, file_pos_t ); /* flush the object buffers */ - obj_handle_t (*flush)(struct fd *, struct async *); + int (*flush)(struct fd *, struct async *); /* perform an ioctl on the file */ int (*ioctl)(struct fd *fd, ioctl_code_t code, struct async *async ); /* queue an async operation */ @@ -102,7 +102,7 @@ extern void fd_async_wake_up( struct fd *fd, int type, unsigned int status ); extern void fd_reselect_async( struct fd *fd, struct async_queue *queue ); extern int no_fd_read( struct fd *fd, struct async *async, file_pos_t pos ); extern int no_fd_write( struct fd *fd, struct async *async, file_pos_t pos ); -extern obj_handle_t no_fd_flush( struct fd *fd, struct async *async ); +extern int no_fd_flush( struct fd *fd, struct async *async ); extern int no_fd_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); extern int default_fd_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); extern void no_fd_queue_async( struct fd *fd, struct async *async, int type, int count ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 1e51ce8..c0bfc2a 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -163,7 +163,7 @@ static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ); static void pipe_server_dump( struct object *obj, int verbose ); static struct fd *pipe_server_get_fd( struct object *obj ); static void pipe_server_destroy( struct object *obj); -static obj_handle_t pipe_server_flush( struct fd *fd, struct async *async ); +static int pipe_server_flush( struct fd *fd, struct async *async ); static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static const struct object_ops pipe_server_ops = @@ -206,7 +206,7 @@ static void pipe_client_dump( struct object *obj, int verbose ); static int pipe_client_signaled( struct object *obj, struct wait_queue_entry *entry ); static struct fd *pipe_client_get_fd( struct object *obj ); static void pipe_client_destroy( struct object *obj ); -static obj_handle_t pipe_client_flush( struct fd *fd, struct async *async ); +static int pipe_client_flush( struct fd *fd, struct async *async ); static int pipe_client_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static const struct object_ops pipe_client_ops = @@ -648,28 +648,25 @@ static void check_flushed( void *arg ) } } -static obj_handle_t pipe_end_flush( struct pipe_end *pipe_end, struct async *async ) +static int pipe_end_flush( struct pipe_end *pipe_end, struct async *async ) { - obj_handle_t handle = 0; - if (use_server_io( pipe_end ) && (!pipe_end->connection || list_empty( &pipe_end->connection->message_queue ))) - return 0; + return 1; if (!fd_queue_async( pipe_end->fd, async, ASYNC_TYPE_WAIT )) return 0; - if (!async_is_blocking( async ) || (handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ))) - set_error( STATUS_PENDING ); - return handle; + set_error( STATUS_PENDING ); + return 1; } -static obj_handle_t pipe_server_flush( struct fd *fd, struct async *async ) +static int pipe_server_flush( struct fd *fd, struct async *async ) { struct pipe_server *server = get_fd_user( fd ); obj_handle_t handle; - if (!server || server->state != ps_connected_server) return 0; + if (!server || server->state != ps_connected_server) return 1; - if (!pipe_data_remaining( server )) return 0; + if (!pipe_data_remaining( server )) return 1; handle = pipe_end_flush( &server->pipe_end, async ); @@ -679,11 +676,11 @@ static obj_handle_t pipe_server_flush( struct fd *fd, struct async *async ) return handle; } -static obj_handle_t pipe_client_flush( struct fd *fd, struct async *async ) +static int pipe_client_flush( struct fd *fd, struct async *async ) { struct pipe_end *pipe_end = get_fd_user( fd ); /* FIXME: Support byte mode. */ - return use_server_io( pipe_end ) ? pipe_end_flush( pipe_end, async ) : 0; + return use_server_io( pipe_end ) ? pipe_end_flush( pipe_end, async ) : 1; } static void message_queue_read( struct pipe_end *pipe_end, struct iosb *iosb )

1 0

Jacek Caban : server: Use create_request_async in ioctl request handler.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: c56c42ff79515a79b1913d31e21d6fecd7c11ef5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c56c42ff79515a79b1913d31e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 12:20:10 2017 +0200 server: Use create_request_async in ioctl request handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 8 +++++--- dlls/ntdll/tests/pipe.c | 6 +++--- server/device.c | 6 +++--- server/fd.c | 19 +++++++------------ server/file.h | 6 +++--- server/named_pipe.c | 44 ++++++++++++++++++++------------------------ server/serial.c | 47 +++++++++++++++++++++++++++-------------------- server/sock.c | 8 +++----- 8 files changed, 71 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c56c42ff79515a79b1913…

1 0

← Newer
1
2
3
4
5
6
7
...
60
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 June 2017