December 2007 - Wine-Commits

Gregor Brunmar : comctl32: Added context menu to treeview.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: f18b428ccfd17903ccbcc7e5d96abd79bb65c901 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f18b428ccfd17903ccbcc7e5d… Author: Gregor Brunmar <gregor.brunmar(a)home.se> Date: Sun Dec 2 12:28:09 2007 +0100 comctl32: Added context menu to treeview. --- dlls/comctl32/treeview.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index aa12c4f..e77051c 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4160,6 +4160,21 @@ TREEVIEW_RButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) static LRESULT TREEVIEW_RButtonUp(const TREEVIEW_INFO *infoPtr, const POINT *pPt) { + TVHITTESTINFO ht; + + ht.pt = *pPt; + + TREEVIEW_HitTest(infoPtr, &ht); + + if (ht.hItem) + { + /* Change to screen coordinate for WM_CONTEXTMENU */ + ClientToScreen(infoPtr->hwnd, &ht.pt); + + /* Send a WM_CONTEXTMENU message in response to the RBUTTONUP */ + SendMessageW(infoPtr->hwnd, WM_CONTEXTMENU, + (WPARAM)infoPtr->hwnd, MAKELPARAM(ht.pt.x, ht.pt.y)); + } return 0; }

1 0

Maarten Lankhorst : winealsa: Simplify the feeding of capture buffers.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: 5290f53193d0d43ad2867098228a2599422ebf61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5290f53193d0d43ad28670982… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Fri Dec 7 10:50:03 2007 +0100 winealsa: Simplify the feeding of capture buffers. --- dlls/winealsa.drv/wavein.c | 178 +++++++++++++------------------------------- 1 files changed, 52 insertions(+), 126 deletions(-) diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index 6d1cf24..652e0cd 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -146,8 +146,6 @@ static DWORD CALLBACK widRecorder(LPVOID pmt) WAVEHDR* lpWaveHdr; DWORD dwSleepTime; DWORD bytesRead; - LPVOID buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, wwi->dwPeriodSize); - char *pOffset = buffer; enum win_wm_message msg; DWORD param; HANDLE ev; @@ -171,140 +169,69 @@ static DWORD CALLBACK widRecorder(LPVOID pmt) */ if (wwi->lpQueuePtr != NULL && wwi->state == WINE_WS_PLAYING) { - int periods; - DWORD frames; - DWORD bytes; - DWORD read; + DWORD frames; + DWORD bytes; + DWORD read; lpWaveHdr = wwi->lpQueuePtr; /* read all the fragments accumulated so far */ - frames = snd_pcm_avail_update(wwi->pcm); - bytes = snd_pcm_frames_to_bytes(wwi->pcm, frames); + frames = snd_pcm_avail_update(wwi->pcm); + bytes = snd_pcm_frames_to_bytes(wwi->pcm, frames); - TRACE("frames = %d bytes = %d\n", frames, bytes); - periods = bytes / wwi->dwPeriodSize; - while ((periods > 0) && (wwi->lpQueuePtr)) + TRACE("frames = %d bytes = %d state=%d\n", frames, bytes, snd_pcm_state(wwi->pcm)); + if (snd_pcm_state(wwi->pcm) == SND_PCM_STATE_XRUN) { - periods--; - bytes = wwi->dwPeriodSize; - TRACE("bytes = %d\n",bytes); - if (lpWaveHdr->dwBufferLength - lpWaveHdr->dwBytesRecorded >= wwi->dwPeriodSize) + FIXME("Recovering from XRUN!\n"); + snd_pcm_prepare(wwi->pcm); + frames = snd_pcm_avail_update(wwi->pcm); + bytes = snd_pcm_frames_to_bytes(wwi->pcm, frames); + snd_pcm_start(wwi->pcm); + snd_pcm_forward(wwi->pcm, frames - snd_pcm_bytes_to_frames(wwi->pcm, wwi->dwPeriodSize)); + continue; + } + while (frames > 0 && wwi->lpQueuePtr) + { + TRACE("bytes = %d\n", bytes); + if (lpWaveHdr->dwBufferLength - lpWaveHdr->dwBytesRecorded < bytes) { - /* directly read fragment in wavehdr */ - read = wwi->read(wwi->pcm, lpWaveHdr->lpData + lpWaveHdr->dwBytesRecorded, frames_per_period); - bytesRead = snd_pcm_frames_to_bytes(wwi->pcm, read); - - TRACE("bytesRead=%d (direct)\n", bytesRead); - if (read != (DWORD) -1) - { - /* update number of bytes recorded in current buffer and by this device */ - lpWaveHdr->dwBytesRecorded += bytesRead; - InterlockedExchangeAdd((LONG*)&wwi->dwTotalRecorded, bytesRead); - - /* buffer is full. notify client */ - if (lpWaveHdr->dwBytesRecorded == lpWaveHdr->dwBufferLength) - { - /* must copy the value of next waveHdr, because we have no idea of what - * will be done with the content of lpWaveHdr in callback - */ - LPWAVEHDR lpNext = lpWaveHdr->lpNext; - - lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; - lpWaveHdr->dwFlags |= WHDR_DONE; - - wwi->lpQueuePtr = lpNext; - widNotifyClient(wwi, WIM_DATA, (DWORD)lpWaveHdr, 0); - lpWaveHdr = lpNext; - } - } else { - FIXME("read(%s, %p, %d) failed (%s)\n", wwi->pcmname, - lpWaveHdr->lpData + lpWaveHdr->dwBytesRecorded, - frames_per_period, snd_strerror(read)); - } + bytes = lpWaveHdr->dwBufferLength - lpWaveHdr->dwBytesRecorded; + frames = snd_pcm_bytes_to_frames(wwi->pcm, bytes); } - else - { - /* read the fragment in a local buffer */ - read = wwi->read(wwi->pcm, buffer, frames_per_period); - bytesRead = snd_pcm_frames_to_bytes(wwi->pcm, read); - pOffset = buffer; + /* directly read fragment in wavehdr */ + read = wwi->read(wwi->pcm, lpWaveHdr->lpData + lpWaveHdr->dwBytesRecorded, frames); + bytesRead = snd_pcm_frames_to_bytes(wwi->pcm, read); - TRACE("bytesRead=%d (local)\n", bytesRead); + TRACE("bytesRead=(%d(%d)/(%d)) -> (%d/%d) \n", bytesRead, read, frames, lpWaveHdr->dwBufferLength, lpWaveHdr->dwBufferLength - lpWaveHdr->dwBytesRecorded); + if (read != (DWORD) -1) + { + /* update number of bytes recorded in current buffer and by this device */ + lpWaveHdr->dwBytesRecorded += bytesRead; + InterlockedExchangeAdd((LONG*)&wwi->dwTotalRecorded, bytesRead); + frames -= read; + bytes -= bytesRead; + + /* buffer is full. notify client */ + if (!snd_pcm_bytes_to_frames(wwi->pcm, lpWaveHdr->dwBytesRecorded - lpWaveHdr->dwBufferLength)) + { + /* must copy the value of next waveHdr, because we have no idea of what + * will be done with the content of lpWaveHdr in callback + */ + LPWAVEHDR lpNext = lpWaveHdr->lpNext; - if (read == (DWORD) -1) { - TRACE("read(%s, %p, %d) failed (%s)\n", wwi->pcmname, - buffer, frames_per_period, strerror(errno)); - continue; - } + lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; + lpWaveHdr->dwFlags |= WHDR_DONE; - /* copy data in client buffers */ - while (read != (DWORD) -1 && bytesRead > 0) - { - DWORD dwToCopy = min (bytesRead, lpWaveHdr->dwBufferLength - lpWaveHdr->dwBytesRecorded); - - memcpy(lpWaveHdr->lpData + lpWaveHdr->dwBytesRecorded, - pOffset, - dwToCopy); - - /* update number of bytes recorded in current buffer and by this device */ - lpWaveHdr->dwBytesRecorded += dwToCopy; - InterlockedExchangeAdd((LONG*)&wwi->dwTotalRecorded, dwToCopy); - bytesRead -= dwToCopy; - pOffset += dwToCopy; - - /* client buffer is full. notify client */ - if (lpWaveHdr->dwBytesRecorded == lpWaveHdr->dwBufferLength) - { - /* must copy the value of next waveHdr, because we have no idea of what - * will be done with the content of lpWaveHdr in callback - */ - LPWAVEHDR lpNext = lpWaveHdr->lpNext; - TRACE("lpNext=%p\n", lpNext); - - lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; - lpWaveHdr->dwFlags |= WHDR_DONE; - - wwi->lpQueuePtr = lpNext; - widNotifyClient(wwi, WIM_DATA, (DWORD)lpWaveHdr, 0); - - lpWaveHdr = lpNext; - if (!lpNext && bytesRead) { - /* before we give up, check for more header messages */ - while (ALSA_PeekRingMessage(&wwi->msgRing, &msg, &param, &ev)) - { - if (msg == WINE_WM_HEADER) { - LPWAVEHDR hdr; - ALSA_RetrieveRingMessage(&wwi->msgRing, &msg, &param, &ev); - hdr = ((LPWAVEHDR)param); - TRACE("msg = %s, hdr = %p, ev = %p\n", ALSA_getCmdString(msg), hdr, ev); - hdr->lpNext = 0; - if (lpWaveHdr == 0) { - /* new head of queue */ - wwi->lpQueuePtr = lpWaveHdr = hdr; - } else { - /* insert buffer at the end of queue */ - LPWAVEHDR* wh; - for (wh = &(wwi->lpQueuePtr); *wh; wh = &((*wh)->lpNext)); - *wh = hdr; - } - } else - break; - } - - if (lpWaveHdr == 0) { - /* no more buffer to copy data to, but we did read more. - * what hasn't been copied will be dropped - */ - WARN("buffer under run! %u bytes dropped.\n", bytesRead); - wwi->lpQueuePtr = NULL; - break; - } - } - } - } - } + wwi->lpQueuePtr = lpNext; + widNotifyClient(wwi, WIM_DATA, (DWORD)lpWaveHdr, 0); + lpWaveHdr = lpNext; + } + } else { + WARN("read(%s, %p, %d) failed (%d/%s)\n", wwi->pcmname, + lpWaveHdr->lpData + lpWaveHdr->dwBytesRecorded, + frames, frames, snd_strerror(read)); + } } - } + } ALSA_WaitRingMessage(&wwi->msgRing, dwSleepTime); @@ -383,7 +310,6 @@ static DWORD CALLBACK widRecorder(LPVOID pmt) wwi->hThread = 0; wwi->state = WINE_WS_CLOSED; SetEvent(ev); - HeapFree(GetProcessHeap(), 0, buffer); ExitThread(0); /* shouldn't go here */ default:

1 0

Gregor Brunmar : comctl32: Disable propsheet apply button at start up.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: 490e0029ea2623f61111408ac1497dd7796d096c URL: http://source.winehq.org/git/wine.git/?a=commit;h=490e0029ea2623f61111408ac… Author: Gregor Brunmar <gregor.brunmar(a)home.se> Date: Sun Dec 2 12:25:00 2007 +0100 comctl32: Disable propsheet apply button at start up. --- dlls/comctl32/propsheet.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 9828d6f..a1a765f 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -3521,6 +3521,8 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) * from which to switch to the next page */ SendMessageW(hwndTabCtrl, TCM_SETCURSEL, psInfo->active_page, 0); + PROPSHEET_UnChanged(hwnd, (HWND)wParam); + return TRUE; }

1 0

Maarten Lankhorst : winealsa: Fix period size in capture.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: 02e1ce0a4236f80cc1782c78290a2b97f9caf5bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=02e1ce0a4236f80cc1782c782… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Fri Dec 7 10:49:50 2007 +0100 winealsa: Fix period size in capture. --- dlls/winealsa.drv/wavein.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index b221c0c..5409624 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -160,7 +160,7 @@ static DWORD CALLBACK widRecorder(LPVOID pmt) SetEvent(wwi->hStartUpEvent); /* make sleep time to be # of ms to output a period */ - dwSleepTime = (1024/*wwi-dwPeriodSize => overrun!*/ * 1000) / wwi->format.Format.nAvgBytesPerSec; + dwSleepTime = (wwi->dwPeriodSize * 1000) / wwi->format.Format.nAvgBytesPerSec; frames_per_period = snd_pcm_bytes_to_frames(wwi->pcm, wwi->dwPeriodSize); TRACE("sleeptime=%d ms\n", dwSleepTime); @@ -581,10 +581,7 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) ALSA_InitRingMessage(&wwi->msgRing); - wwi->dwPeriodSize = period_size; - /*if (wwi->dwFragmentSize % wwi->format.Format.nBlockAlign) - ERR("Fragment doesn't contain an integral number of data blocks\n"); - */ + wwi->dwPeriodSize = snd_pcm_frames_to_bytes(pcm, period_size); TRACE("dwPeriodSize=%u\n", wwi->dwPeriodSize); TRACE("wBitsPerSample=%u, nAvgBytesPerSec=%u, nSamplesPerSec=%u, nChannels=%u nBlockAlign=%u!\n", wwi->format.Format.wBitsPerSample, wwi->format.Format.nAvgBytesPerSec,

1 0

Maarten Lankhorst : winealsa: Fix return value checking in wavein.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: 9fb2cacd64dd6a039b9edd4fbdf72c27a8bd6590 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fb2cacd64dd6a039b9edd4fb… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Fri Dec 7 10:49:56 2007 +0100 winealsa: Fix return value checking in wavein. --- dlls/winealsa.drv/wavein.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index 5409624..6d1cf24 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -162,7 +162,7 @@ static DWORD CALLBACK widRecorder(LPVOID pmt) /* make sleep time to be # of ms to output a period */ dwSleepTime = (wwi->dwPeriodSize * 1000) / wwi->format.Format.nAvgBytesPerSec; frames_per_period = snd_pcm_bytes_to_frames(wwi->pcm, wwi->dwPeriodSize); - TRACE("sleeptime=%d ms\n", dwSleepTime); + TRACE("sleeptime=%d ms, total buffer length=%d ms (%d bytes)\n", dwSleepTime, wwi->dwBufferSize * 1000 / wwi->format.Format.nAvgBytesPerSec, wwi->dwBufferSize); for (;;) { /* wait for dwSleepTime or an event in thread's queue */ @@ -180,6 +180,7 @@ static DWORD CALLBACK widRecorder(LPVOID pmt) /* read all the fragments accumulated so far */ frames = snd_pcm_avail_update(wwi->pcm); bytes = snd_pcm_frames_to_bytes(wwi->pcm, frames); + TRACE("frames = %d bytes = %d\n", frames, bytes); periods = bytes / wwi->dwPeriodSize; while ((periods > 0) && (wwi->lpQueuePtr)) @@ -194,7 +195,7 @@ static DWORD CALLBACK widRecorder(LPVOID pmt) bytesRead = snd_pcm_frames_to_bytes(wwi->pcm, read); TRACE("bytesRead=%d (direct)\n", bytesRead); - if (bytesRead != (DWORD) -1) + if (read != (DWORD) -1) { /* update number of bytes recorded in current buffer and by this device */ lpWaveHdr->dwBytesRecorded += bytesRead; @@ -216,9 +217,9 @@ static DWORD CALLBACK widRecorder(LPVOID pmt) lpWaveHdr = lpNext; } } else { - TRACE("read(%s, %p, %d) failed (%s)\n", wwi->pcmname, + FIXME("read(%s, %p, %d) failed (%s)\n", wwi->pcmname, lpWaveHdr->lpData + lpWaveHdr->dwBytesRecorded, - frames_per_period, strerror(errno)); + frames_per_period, snd_strerror(read)); } } else @@ -230,14 +231,14 @@ static DWORD CALLBACK widRecorder(LPVOID pmt) TRACE("bytesRead=%d (local)\n", bytesRead); - if (bytesRead == (DWORD) -1) { + if (read == (DWORD) -1) { TRACE("read(%s, %p, %d) failed (%s)\n", wwi->pcmname, buffer, frames_per_period, strerror(errno)); continue; } /* copy data in client buffers */ - while (bytesRead != (DWORD) -1 && bytesRead > 0) + while (read != (DWORD) -1 && bytesRead > 0) { DWORD dwToCopy = min (bytesRead, lpWaveHdr->dwBufferLength - lpWaveHdr->dwBytesRecorded);

1 0

Alexandre Julliard : msvfw32: Fix invalid check that caused the rest of VideoCapDriverDescAndVer16 to be optimized out .
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: 5c9396d734447ed4d36bf6497e018ae4399e4c7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c9396d734447ed4d36bf6497… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 7 18:42:00 2007 +0100 msvfw32: Fix invalid check that caused the rest of VideoCapDriverDescAndVer16 to be optimized out. --- dlls/msvfw32/Makefile.in | 2 +- dlls/msvfw32/msvideo16.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvfw32/Makefile.in b/dlls/msvfw32/Makefile.in index 4014d5d..5e3218c 100644 --- a/dlls/msvfw32/Makefile.in +++ b/dlls/msvfw32/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msvfw32.dll IMPORTLIB = libmsvfw32.$(IMPLIBEXT) -IMPORTS = winmm comctl32 user32 gdi32 advapi32 kernel32 ntdll +IMPORTS = winmm version comctl32 user32 gdi32 advapi32 kernel32 ntdll C_SRCS = \ mciwnd.c \ diff --git a/dlls/msvfw32/msvideo16.c b/dlls/msvfw32/msvideo16.c index 00e0889..263f21b 100644 --- a/dlls/msvfw32/msvideo16.c +++ b/dlls/msvfw32/msvideo16.c @@ -813,7 +813,7 @@ DWORD WINAPI VideoCapDriverDescAndVer16(WORD nr, LPSTR buf1, WORD buf1len, } } - if (nr || !found) + if (!found) { TRACE("No more VID* entries found nr=%d\n", nr); return 20;

1 0

Alexandre Julliard : server: Fix incorrect use of size_t instead of data_size_t.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: d65c6678175004b4607d32465646b87fcc3acebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d65c6678175004b4607d32465… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 7 18:42:48 2007 +0100 server: Fix incorrect use of size_t instead of data_size_t. --- server/directory.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/directory.c b/server/directory.c index bf1cd69..d1d323c 100644 --- a/server/directory.c +++ b/server/directory.c @@ -483,7 +483,7 @@ DECL_HANDLER(get_directory_entry) struct object *obj = find_object_index( dir->entries, req->index ); if (obj) { - size_t name_len, type_len = 0; + data_size_t name_len, type_len = 0; const WCHAR *type_name = NULL; const WCHAR *name = get_object_name( obj, &name_len ); struct object_type *type = obj->ops->get_type( obj );

1 0

Alexandre Julliard : comctl32: Fix a compiler warning.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: b406e9a7b478d49761b6077b148c8e9f2cd402f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b406e9a7b478d49761b6077b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 7 18:43:05 2007 +0100 comctl32: Fix a compiler warning. --- dlls/comctl32/listview.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index e551ebe..5e4d4c0 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5040,12 +5040,12 @@ static INT LISTVIEW_FindItemA(const LISTVIEW_INFO *infoPtr, INT nStart, BOOL hasText = lpFindInfo->flags & (LVFI_STRING | LVFI_PARTIAL); LVFINDINFOW fiw; INT res; - LPWSTR strW; + LPWSTR strW = NULL; memcpy(&fiw, lpFindInfo, sizeof(fiw)); if (hasText) fiw.psz = strW = textdupTtoW((LPCWSTR)lpFindInfo->psz, FALSE); res = LISTVIEW_FindItemW(infoPtr, nStart, &fiw); - if (hasText) textfreeT(strW, FALSE); + textfreeT(strW, FALSE); return res; }

1 0

Alexandre Julliard : Avoid size_t types in traces.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: c0b12351e08a02fae48fba8d00471e840d7ccf81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0b12351e08a02fae48fba8d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 7 18:49:18 2007 +0100 Avoid size_t types in traces. --- dlls/advapi32/tests/security.c | 4 ++-- dlls/comctl32/tests/mru.c | 8 ++++---- dlls/dsound/dsound.c | 4 ++-- dlls/riched20/tests/editor.c | 4 ++-- dlls/riched32/tests/editor.c | 4 ++-- dlls/rpcrt4/tests/ndr_marshall.c | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 0d269b5..e9f4795 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2163,12 +2163,12 @@ static void test_ConvertSecurityDescriptorToString() * don't replicate this feature so we only test len >= strlen+1. */ #define CHECK_RESULT_AND_FREE(exp_str) \ ok(strcmp(string, (exp_str)) == 0, "String mismatch (expected \"%s\", got \"%s\")\n", (exp_str), string); \ - ok(len >= (strlen(exp_str) + 1), "Length mismatch (expected %d, got %d)\n", strlen(exp_str) + 1, len); \ + ok(len >= (lstrlen(exp_str) + 1), "Length mismatch (expected %d, got %d)\n", lstrlen(exp_str) + 1, len); \ LocalFree(string); #define CHECK_ONE_OF_AND_FREE(exp_str1, exp_str2) \ ok(strcmp(string, (exp_str1)) == 0 || strcmp(string, (exp_str2)) == 0, "String mismatch (expected\n\"%s\" or\n\"%s\", got\n\"%s\")\n", (exp_str1), (exp_str2), string); \ - ok(len >= (strlen(string) + 1), "Length mismatch (expected %d, got %d)\n", strlen(string) + 1, len); \ + ok(len >= (strlen(string) + 1), "Length mismatch (expected %d, got %d)\n", lstrlen(string) + 1, len); \ LocalFree(string); InitializeSecurityDescriptor(&desc, SECURITY_DESCRIPTOR_REVISION); diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c index 5201a95..cf42e9e 100644 --- a/dlls/comctl32/tests/mru.c +++ b/dlls/comctl32/tests/mru.c @@ -307,7 +307,7 @@ static void test_MRUListA(void) /* check entry 0 */ buffer[0] = 0; iRet = pEnumMRUList(hMRU, 0, buffer, 255); - todo_wine ok(iRet == strlen(checks[3]), "EnumMRUList expected %d, got %d\n", strlen(checks[3]), iRet); + todo_wine ok(iRet == lstrlen(checks[3]), "EnumMRUList expected %d, got %d\n", lstrlen(checks[3]), iRet); ok(strcmp(buffer, checks[3]) == 0, "EnumMRUList expected %s, got %s\n", checks[3], buffer); /* check entry 0 with a too small buffer */ @@ -316,7 +316,7 @@ static void test_MRUListA(void) buffer[2] = 'A'; /* unchanged */ buffer[3] = 0; /* unchanged */ iRet = pEnumMRUList(hMRU, 0, buffer, 2); - todo_wine ok(iRet == strlen(checks[3]), "EnumMRUList expected %d, got %d\n", strlen(checks[3]), iRet); + todo_wine ok(iRet == lstrlen(checks[3]), "EnumMRUList expected %d, got %d\n", lstrlen(checks[3]), iRet); todo_wine ok(strcmp(buffer, "T") == 0, "EnumMRUList expected %s, got %s\n", "T", buffer); /* make sure space after buffer has old values */ ok(buffer[2] == 'A', "EnumMRUList expected %02x, got %02x\n", 'A', buffer[2]); @@ -324,13 +324,13 @@ static void test_MRUListA(void) /* check entry 1 */ buffer[0] = 0; iRet = pEnumMRUList(hMRU, 1, buffer, 255); - todo_wine ok(iRet == strlen(checks[1]), "EnumMRUList expected %d, got %d\n", strlen(checks[1]), iRet); + todo_wine ok(iRet == lstrlen(checks[1]), "EnumMRUList expected %d, got %d\n", lstrlen(checks[1]), iRet); ok(strcmp(buffer, checks[1]) == 0, "EnumMRUList expected %s, got %s\n", checks[1], buffer); /* check entry 2 */ buffer[0] = 0; iRet = pEnumMRUList(hMRU, 2, buffer, 255); - todo_wine ok(iRet == strlen(checks[2]), "EnumMRUList expected %d, got %d\n", strlen(checks[2]), iRet); + todo_wine ok(iRet == lstrlen(checks[2]), "EnumMRUList expected %d, got %d\n", lstrlen(checks[2]), iRet); ok(strcmp(buffer, checks[2]) == 0, "EnumMRUList expected %s, got %s\n", checks[2], buffer); /* check out of bounds entry 3 */ diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 7b2d5d6..73fbd91 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1587,13 +1587,13 @@ HRESULT DirectSoundDevice_CreateSoundBuffer( { if (pwfxe->Format.cbSize < (sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX))) { - WARN("Too small a cbSize (%d/%d)\n", pwfxe->Format.cbSize, (sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX))); + WARN("Too small a cbSize %u\n", pwfxe->Format.cbSize); return DSERR_INVALIDPARAM; } if (pwfxe->Format.cbSize > (sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX))) { - WARN("Too big a cbSize (%d/%d)\n", pwfxe->Format.cbSize, (sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX))); + WARN("Too big a cbSize %u\n", pwfxe->Format.cbSize); return DSERR_CONTROLUNAVAIL; } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index c3d09bf..7a5c9c9 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1070,9 +1070,9 @@ static void test_WM_SETTEXT() result = SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) a); \ ok (result == 1, "WM_SETTEXT returned %ld instead of 1\n", result); \ result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buf); \ - ok (result == strlen(buf), \ + ok (result == lstrlen(buf), \ "WM_GETTEXT returned %ld instead of expected %u\n", \ - result, strlen(buf)); \ + result, lstrlen(buf)); \ result = strcmp(b, buf); \ ok(result == 0, \ "WM_SETTEXT round trip: strcmp = %ld\n", result); diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 6d0c04e..77c86e7 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -78,9 +78,9 @@ static void test_WM_SETTEXT() result = SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) a); \ ok (result == 1, "WM_SETTEXT returned %ld instead of 1\n", result); \ result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buf); \ - ok (result == strlen(buf), \ + ok (result == lstrlen(buf), \ "WM_GETTEXT returned %ld instead of expected %u\n", \ - result, strlen(buf)); \ + result, lstrlen(buf)); \ result = strcmp(b, buf); \ if (is_todo) todo_wine { \ ok(result == 0, \ diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index e4e2399..d72d76f 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1141,7 +1141,7 @@ static void test_conformant_string(void) ptr = NdrPointerMarshall( &StubMsg, (unsigned char *)memsrc, fmtstr_conf_str ); ok(ptr == NULL, "ret %p\n", ptr); ok(StubMsg.Buffer - StubMsg.BufferStart == sizeof(memsrc) + 12, "Buffer %p Start %p len %d\n", - StubMsg.Buffer, StubMsg.BufferStart, 12 + sizeof(memsrc)); + StubMsg.Buffer, StubMsg.BufferStart, StubMsg.Buffer - StubMsg.BufferStart); ok(!memcmp(StubMsg.BufferStart + 12, memsrc, sizeof(memsrc)), "incorrectly marshaled\n"); StubMsg.Buffer = StubMsg.BufferStart;

1 0

Rob Shearman : ole32: Process messages while waiting for a local server to create a pipe.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: 7ac980b1e7119ac93e6ba370c798681c9ae25b01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ac980b1e7119ac93e6ba370c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Dec 7 14:45:16 2007 +0000 ole32: Process messages while waiting for a local server to create a pipe. --- dlls/ole32/rpc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 40330d4..6760eb8 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1725,15 +1725,15 @@ HRESULT RPC_GetLocalClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) WaitNamedPipeW( pipefn, NMPWAIT_WAIT_FOREVER ); hPipe = CreateFileW(pipefn, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); if (hPipe == INVALID_HANDLE_VALUE) { + DWORD index; if (tries == 1) { if ( (hres = create_local_service(rclsid)) && (hres = create_server(rclsid)) ) return hres; - Sleep(1000); } else { WARN("Connecting to %s, no response yet, retrying: le is %u\n", debugstr_w(pipefn), GetLastError()); - Sleep(1000); } + CoWaitForMultipleHandles(0, 1000, 0, NULL, &index); continue; } bufferlen = 0;

1 0