March 2007 - Wine-commits - list.winehq.org

Paul Vriens : kernel32/profile: Rename a test.
by Alexandre Julliard 28 Mar '07

28 Mar '07

Module: wine Branch: master Commit: 2559440dc92fa37434a10b539a6d3e1d77bf7e33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2559440dc92fa37434a10b539… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Mar 27 22:07:57 2007 +0200 kernel32/profile: Rename a test. --- dlls/kernel32/tests/profile.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 3ee66eb..64fee87 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -135,7 +135,7 @@ static void test_profile_string(void) DeleteFileA( TESTFILE2); } -static void test_profile_sections(void) +static void test_profile_sections_names(void) { HANDLE h; int ret; @@ -205,5 +205,5 @@ START_TEST(profile) { test_profile_int(); test_profile_string(); - test_profile_sections(); + test_profile_sections_names(); }

1 0

Paul Vriens : kernel32/profile: Move GetPrivateProfileSectionA to its own test.
by Alexandre Julliard 28 Mar '07

28 Mar '07

Module: wine Branch: master Commit: 0230695a29d4fd807087de7c766430fd969966a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0230695a29d4fd807087de7c7… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Mar 27 22:08:07 2007 +0200 kernel32/profile: Move GetPrivateProfileSectionA to its own test. --- dlls/kernel32/tests/profile.c | 35 ++++++++++++++++++++++++++++------- 1 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 64fee87..0893c1c 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -116,13 +116,6 @@ static void test_profile_string(void) ok( ret == 18 && !strcmp( buf, "name1,name2,name4"), "wrong keys returned(%d): %s\n", ret, buf); - ret=GetPrivateProfileSectionA("s", buf, sizeof(buf), TESTFILE2); - for( p = buf + strlen(buf) + 1; *p;p += strlen(p)+1) - p[-1] = ','; - /* and test */ - ok( ret == 35 && !strcmp( buf, "name1=val1,name2=,name3,name4=val4"), "wrong section returned(%d): %s\n", - ret, buf); - /* add a new key to test that the file is quite usable */ WritePrivateProfileStringA( "s", "name5", "val5", TESTFILE2); ret=GetPrivateProfileStringA( "s", NULL, "", buf, sizeof(buf), @@ -135,6 +128,33 @@ static void test_profile_string(void) DeleteFileA( TESTFILE2); } +static void test_profile_sections(void) +{ + HANDLE h; + int ret; + DWORD count; + char buf[100]; + char *p; + static const char content[]="[s]\r\nname1=val1\r\nname2=\r\nname3\r\nname4=val4\r\n"; + static const char testfile4[]=".\\testwine4.ini"; + + DeleteFileA( testfile4 ); + h = CreateFileA( testfile4, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok( h != INVALID_HANDLE_VALUE, " cannot create %s\n", testfile4); + if( h == INVALID_HANDLE_VALUE) return; + WriteFile( h, content, sizeof(content), &count, NULL); + CloseHandle( h); + + ret=GetPrivateProfileSectionA("s", buf, sizeof(buf), testfile4); + for( p = buf + strlen(buf) + 1; *p;p += strlen(p)+1) + p[-1] = ','; + /* and test */ + ok( ret == 35 && !strcmp( buf, "name1=val1,name2=,name3,name4=val4"), "wrong section returned(%d): %s\n", + ret, buf); + + DeleteFileA( testfile4 ); +} + static void test_profile_sections_names(void) { HANDLE h; @@ -205,5 +225,6 @@ START_TEST(profile) { test_profile_int(); test_profile_string(); + test_profile_sections(); test_profile_sections_names(); }

1 0

Paul Vriens : kernel32/profile: Add a few NULL checks (Coverity).
by Alexandre Julliard 28 Mar '07

28 Mar '07

Module: wine Branch: master Commit: 4a431afd6914b47c5aefe188ed42b89159e984f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a431afd6914b47c5aefe188e… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Mar 27 22:08:14 2007 +0200 kernel32/profile: Add a few NULL checks (Coverity). --- dlls/kernel32/profile.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 0abb887..27a3d06 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1322,7 +1322,13 @@ UINT WINAPI GetPrivateProfileIntA( LPCSTR section, LPCSTR entry, INT WINAPI GetPrivateProfileSectionW( LPCWSTR section, LPWSTR buffer, DWORD len, LPCWSTR filename ) { - int ret = 0; + int ret = 0; + + if (!section || !buffer) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } TRACE("(%s, %p, %d, %s)\n", debugstr_w(section), buffer, len, debugstr_w(filename)); @@ -1346,9 +1352,14 @@ INT WINAPI GetPrivateProfileSectionA( LPCSTR section, LPSTR buffer, LPWSTR bufferW; INT retW, ret = 0; - bufferW = buffer ? HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)) : NULL; - if (section) RtlCreateUnicodeStringFromAsciiz(&sectionW, section); - else sectionW.Buffer = NULL; + if (!section || !buffer) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + bufferW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + RtlCreateUnicodeStringFromAsciiz(&sectionW, section); if (filename) RtlCreateUnicodeStringFromAsciiz(&filenameW, filename); else filenameW.Buffer = NULL;

1 0

Andrew Talbot : comctl32: Constify some variables.
by Alexandre Julliard 28 Mar '07

28 Mar '07

Module: wine Branch: master Commit: 3253bf5570629fa82f4d1f2d2cacbee6e1286b5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3253bf5570629fa82f4d1f2d2… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Mar 27 21:11:27 2007 +0100 comctl32: Constify some variables. --- dlls/comctl32/ipaddress.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index 0ccb347..36682ae 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -77,7 +77,7 @@ static const WCHAR IP_SUBCLASS_PROP[] = static LRESULT CALLBACK IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); -static LRESULT IPADDRESS_Notify (IPADDRESS_INFO *infoPtr, UINT command) +static LRESULT IPADDRESS_Notify (const IPADDRESS_INFO *infoPtr, UINT command) { HWND hwnd = infoPtr->Self; @@ -87,7 +87,7 @@ static LRESULT IPADDRESS_Notify (IPADDRESS_INFO *infoPtr, UINT command) MAKEWPARAM (GetWindowLongPtrW (hwnd, GWLP_ID), command), (LPARAM)hwnd); } -static INT IPADDRESS_IPNotify (IPADDRESS_INFO *infoPtr, INT field, INT value) +static INT IPADDRESS_IPNotify (const IPADDRESS_INFO *infoPtr, INT field, INT value) { NMIPADDRESS nmip; @@ -109,7 +109,7 @@ static INT IPADDRESS_IPNotify (IPADDRESS_INFO *infoPtr, INT field, INT value) } -static int IPADDRESS_GetPartIndex(IPADDRESS_INFO *infoPtr, HWND hwnd) +static int IPADDRESS_GetPartIndex(const IPADDRESS_INFO *infoPtr, HWND hwnd) { int i; @@ -123,7 +123,7 @@ static int IPADDRESS_GetPartIndex(IPADDRESS_INFO *infoPtr, HWND hwnd) } -static LRESULT IPADDRESS_Draw (IPADDRESS_INFO *infoPtr, HDC hdc) +static LRESULT IPADDRESS_Draw (const IPADDRESS_INFO *infoPtr, HDC hdc) { static const WCHAR dotW[] = { '.', 0 }; RECT rect, rcPart; @@ -165,7 +165,7 @@ static LRESULT IPADDRESS_Draw (IPADDRESS_INFO *infoPtr, HDC hdc) } -static LRESULT IPADDRESS_Create (HWND hwnd, LPCREATESTRUCTA lpCreate) +static LRESULT IPADDRESS_Create (HWND hwnd, const CREATESTRUCTA *lpCreate) { static const WCHAR EDIT[] = { 'E', 'd', 'i', 't', 0 }; IPADDRESS_INFO *infoPtr; @@ -246,7 +246,7 @@ static LRESULT IPADDRESS_Enable (IPADDRESS_INFO *infoPtr, BOOL enabled) } -static LRESULT IPADDRESS_Paint (IPADDRESS_INFO *infoPtr, HDC hdc) +static LRESULT IPADDRESS_Paint (const IPADDRESS_INFO *infoPtr, HDC hdc) { PAINTSTRUCT ps; @@ -261,7 +261,7 @@ static LRESULT IPADDRESS_Paint (IPADDRESS_INFO *infoPtr, HDC hdc) } -static BOOL IPADDRESS_IsBlank (IPADDRESS_INFO *infoPtr) +static BOOL IPADDRESS_IsBlank (const IPADDRESS_INFO *infoPtr) { int i; @@ -274,7 +274,7 @@ static BOOL IPADDRESS_IsBlank (IPADDRESS_INFO *infoPtr) } -static int IPADDRESS_GetAddress (IPADDRESS_INFO *infoPtr, LPDWORD ip_address) +static int IPADDRESS_GetAddress (const IPADDRESS_INFO *infoPtr, LPDWORD ip_address) { WCHAR field[5]; int i, invalid = 0; @@ -308,7 +308,7 @@ static BOOL IPADDRESS_SetRange (IPADDRESS_INFO *infoPtr, int index, WORD range) } -static void IPADDRESS_ClearAddress (IPADDRESS_INFO *infoPtr) +static void IPADDRESS_ClearAddress (const IPADDRESS_INFO *infoPtr) { WCHAR nil[1] = { 0 }; int i; @@ -320,7 +320,7 @@ static void IPADDRESS_ClearAddress (IPADDRESS_INFO *infoPtr) } -static LRESULT IPADDRESS_SetAddress (IPADDRESS_INFO *infoPtr, DWORD ip_address) +static LRESULT IPADDRESS_SetAddress (const IPADDRESS_INFO *infoPtr, DWORD ip_address) { WCHAR buf[20]; static const WCHAR fmt[] = { '%', 'd', 0 }; @@ -329,7 +329,7 @@ static LRESULT IPADDRESS_SetAddress (IPADDRESS_INFO *infoPtr, DWORD ip_address) TRACE("\n"); for (i = 3; i >= 0; i--) { - IPPART_INFO* part = &infoPtr->Part[i]; + const IPPART_INFO* part = &infoPtr->Part[i]; int value = ip_address & 0xff; if ( (value >= part->LowerLimit) && (value <= part->UpperLimit) ) { wsprintfW (buf, fmt, value); @@ -343,7 +343,7 @@ static LRESULT IPADDRESS_SetAddress (IPADDRESS_INFO *infoPtr, DWORD ip_address) } -static void IPADDRESS_SetFocusToField (IPADDRESS_INFO *infoPtr, INT index) +static void IPADDRESS_SetFocusToField (const IPADDRESS_INFO *infoPtr, INT index) { TRACE("(index=%d)\n", index); @@ -353,9 +353,9 @@ static void IPADDRESS_SetFocusToField (IPADDRESS_INFO *infoPtr, INT index) } -static BOOL IPADDRESS_ConstrainField (IPADDRESS_INFO *infoPtr, int currentfield) +static BOOL IPADDRESS_ConstrainField (const IPADDRESS_INFO *infoPtr, int currentfield) { - IPPART_INFO *part = &infoPtr->Part[currentfield]; + const IPPART_INFO *part = &infoPtr->Part[currentfield]; WCHAR field[10]; static const WCHAR fmt[] = { '%', 'd', 0 }; int curValue, newValue; @@ -383,7 +383,7 @@ static BOOL IPADDRESS_ConstrainField (IPADDRESS_INFO *infoPtr, int currentfield) } -static BOOL IPADDRESS_GotoNextField (IPADDRESS_INFO *infoPtr, int cur, int sel) +static BOOL IPADDRESS_GotoNextField (const IPADDRESS_INFO *infoPtr, int cur, int sel) { TRACE("\n"); @@ -391,7 +391,7 @@ static BOOL IPADDRESS_GotoNextField (IPADDRESS_INFO *infoPtr, int cur, int sel) IPADDRESS_ConstrainField(infoPtr, cur); if(cur < 3) { - IPPART_INFO *next = &infoPtr->Part[cur + 1]; + const IPPART_INFO *next = &infoPtr->Part[cur + 1]; int start = 0, end = 0; SetFocus (next->EditHwnd); if (sel != POS_DEFAULT) {

1 0

Chris Robinson : winemp3: Clear stream buffers when the stream is reset.
by Alexandre Julliard 28 Mar '07

28 Mar '07

Module: wine Branch: master Commit: 7d085d2cd4cd1d626944e8591232a328ae615773 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d085d2cd4cd1d626944e8591… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Mar 27 21:47:09 2007 -0700 winemp3: Clear stream buffers when the stream is reset. --- dlls/winemp3.acm/mpegl3.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index 4c639e5..6d95a0b 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -374,6 +374,8 @@ static LRESULT MPEG3_FormatSuggest(PACMDRVFORMATSUGGEST adfs) */ static void MPEG3_Reset(PACMDRVSTREAMINSTANCE adsi, AcmMpeg3Data* aad) { + ExitMP3(&aad->mp); + InitMP3(&aad->mp); } /***********************************************************************

1 0

Mikołaj Zalewski : comctl32: toolbar: TB_HIDEBUTTON and TB_MOVEBUTTON shouldn't force a recalc.
by Alexandre Julliard 28 Mar '07

28 Mar '07

Module: wine Branch: master Commit: 7bf7cdd1a9d46ac403f5f94cae009dc53334fdfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bf7cdd1a9d46ac403f5f94ca… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Mar 27 09:44:46 2007 +0200 comctl32: toolbar: TB_HIDEBUTTON and TB_MOVEBUTTON shouldn't force a recalc. --- dlls/comctl32/tests/toolbar.c | 12 ++++++++++++ dlls/comctl32/toolbar.c | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index d5b055e..08ce4e0 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -843,6 +843,18 @@ static void test_sizes(void) SendMessageA(hToolbar, TB_INSERTBUTTON, 1, (LPARAM)&buttons2[0]); ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(23, 22), "Unexpected button size\n"); + /* TB_HIDEBUTTON and TB_MOVEBUTTON doesn't force a recalc */ + SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELONG(100, 100)); + ok(SendMessageA(hToolbar, TB_MOVEBUTTON, 0, 1), "TB_MOVEBUTTON failed\n"); + ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(100, 100), "Unexpected button size\n"); + ok(SendMessageA(hToolbar, TB_HIDEBUTTON, 20, TRUE), "TB_HIDEBUTTON failed\n"); + ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(100, 100), "Unexpected button size\n"); + /* however changing the hidden flag with TB_SETSTATE does */ + ok(SendMessageA(hToolbar, TB_SETSTATE, 20, TBSTATE_ENABLED|TBSTATE_HIDDEN), "TB_SETSTATE failed\n"); + ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(100, 100), "Unexpected button size\n"); + ok(SendMessageA(hToolbar, TB_SETSTATE, 20, TBSTATE_ENABLED), "TB_SETSTATE failed\n"); + ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(23, 22), "Unexpected button size\n"); + rebuild_toolbar(&hToolbar); SendMessageA(hToolbar, TB_ADDBUTTONS, 1, (LPARAM)&buttons3[3]); ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(27, 39), "Unexpected button size\n"); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index c17e7b9..56dde25 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3757,7 +3757,7 @@ TOOLBAR_HideButton (HWND hwnd, WPARAM wParam, LPARAM lParam) else btnPtr->fsState |= TBSTATE_HIDDEN; - TOOLBAR_CalcToolbar (hwnd); + TOOLBAR_LayoutToolbar (hwnd); InvalidateRect (hwnd, NULL, TRUE); @@ -4099,7 +4099,7 @@ TOOLBAR_MoveButton (HWND hwnd, WPARAM wParam, LPARAM lParam) TOOLBAR_MoveFixupIndex(&infoPtr->nHotItem, nIndex, nMoveIndex, FALSE); } - TOOLBAR_CalcToolbar(hwnd); + TOOLBAR_LayoutToolbar(hwnd); TOOLBAR_AutoSize(hwnd); InvalidateRect(hwnd, NULL, TRUE);

1 0

Dmitry Timoshkov : gdi32: Make the EMF driver return sane NUMCOLORS value.
by Alexandre Julliard 28 Mar '07

28 Mar '07

Module: wine Branch: master Commit: dab3825b180ecf3517af6e5166c1ed84e7f35944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dab3825b180ecf3517af6e516… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Mar 27 16:54:49 2007 +0900 gdi32: Make the EMF driver return sane NUMCOLORS value. --- dlls/gdi32/enhmfdrv/dc.c | 4 ++-- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 + dlls/gdi32/enhmfdrv/init.c | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 485d205..74300b4 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -317,10 +317,10 @@ INT EMFDRV_GetDeviceCaps(PHYSDEV dev, INT cap) return physDev->technology; case PLANES: return physDev->planes; - + case NUMCOLORS: + return physDev->numcolors; default: FIXME("Unimplemented cap %d\n", cap); return 0; - } } diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 6d84d19..b0d6bf0 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -46,6 +46,7 @@ typedef struct INT rastercaps; INT technology; INT planes; + INT numcolors; } EMFDRV_PDEVICE; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 82d61c6..4f418e1 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -356,6 +356,7 @@ HDC WINAPI CreateEnhMetaFileW( physDev->rastercaps = GetDeviceCaps(hRefDC, RASTERCAPS); physDev->technology = GetDeviceCaps(hRefDC, TECHNOLOGY); physDev->planes = GetDeviceCaps(hRefDC, PLANES); + physDev->numcolors = GetDeviceCaps(hRefDC, NUMCOLORS); physDev->emh->iType = EMR_HEADER; physDev->emh->nSize = size;

1 0

Chris Robinson : quartz: Protect DSound buffer creation with a critical section lock.
by Alexandre Julliard 28 Mar '07

28 Mar '07

Module: wine Branch: master Commit: 8a1d4d1e4c6dca0b3be6c0784861aed4c6451679 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a1d4d1e4c6dca0b3be6c0784… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Mar 27 02:45:15 2007 -0700 quartz: Protect DSound buffer creation with a critical section lock. --- dlls/quartz/dsoundrender.c | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 80f7257..259a25b 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -132,11 +132,20 @@ static HRESULT DSoundRender_CreateSoundBuffer(IBaseFilter * iface) TRACE("nBlockAlign = %d\n", format->nBlockAlign); TRACE("wBitsPerSample = %d\n", format->wBitsPerSample); TRACE("cbSize = %d\n", format->cbSize); - + + /* Lock the critical section to make sure we're still marked to play while + setting up the playback buffer */ + EnterCriticalSection(&This->csFilter); + + if (This->state != State_Running) { + hr = VFW_E_WRONG_STATE; + goto getout; + } + hr = DirectSoundCreate(NULL, &This->dsound, NULL); if (FAILED(hr)) { ERR("Cannot create Direct Sound object\n"); - return hr; + goto getout; } wav_fmt = *format; @@ -151,7 +160,7 @@ static HRESULT DSoundRender_CreateSoundBuffer(IBaseFilter * iface) if (FAILED(hr)) { ERR("Can't create sound buffer !\n"); IDirectSound_Release(This->dsound); - return hr; + goto getout; } hr = IDirectSoundBuffer_SetVolume(This->dsbuffer, This->volume); @@ -167,11 +176,13 @@ static HRESULT DSoundRender_CreateSoundBuffer(IBaseFilter * iface) ERR("Can't start sound buffer (%x)!\n", hr); IDirectSoundBuffer_Release(This->dsbuffer); IDirectSound_Release(This->dsound); - return hr; + goto getout; } This->write_pos = 0; - + +getout: + LeaveCriticalSection(&This->csFilter); return hr; }

1 0

Alexandre Julliard : server: Add support for queuing a user APC upon async I/O completion.
by Alexandre Julliard 28 Mar '07

28 Mar '07

Module: wine Branch: master Commit: c16eb8efd942bfbb0bb7f3da4c740a2e483cce28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c16eb8efd942bfbb0bb7f3da4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 27 16:42:27 2007 +0200 server: Add support for queuing a user APC upon async I/O completion. --- dlls/ntdll/directory.c | 11 +++-------- dlls/ntdll/file.c | 12 ++++++++---- include/wine/server_protocol.h | 4 +++- server/async.c | 10 ++++++++++ server/protocol.def | 2 ++ server/trace.c | 4 ++-- 6 files changed, 28 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index e60dad7..697fd1a 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2164,8 +2164,6 @@ done: struct read_changes_info { HANDLE FileHandle; - PIO_APC_ROUTINE ApcRoutine; - PVOID ApcContext; PVOID Buffer; ULONG BufferSize; }; @@ -2177,7 +2175,7 @@ static void WINAPI read_changes_apc( void *user, PIO_STATUS_BLOCK iosb, ULONG st NTSTATUS ret = STATUS_SUCCESS; int len, action, i; - TRACE("%p %p %p %08x\n", info, info->ApcContext, iosb, status); + TRACE("%p %p %08x\n", info, iosb, status); /* * FIXME: race me! @@ -2266,9 +2264,6 @@ NtNotifyChangeDirectoryFile( HANDLE FileHandle, HANDLE Event, if (CompletionFilter == 0 || (CompletionFilter & ~FILE_NOTIFY_ALL)) return STATUS_INVALID_PARAMETER; - if (ApcRoutine) - FIXME("parameters ignored %p %p\n", ApcRoutine, ApcContext ); - info = RtlAllocateHeap( GetProcessHeap(), 0, sizeof *info ); if (!info) return STATUS_NO_MEMORY; @@ -2276,8 +2271,6 @@ NtNotifyChangeDirectoryFile( HANDLE FileHandle, HANDLE Event, info->FileHandle = FileHandle; info->Buffer = Buffer; info->BufferSize = BufferSize; - info->ApcRoutine = ApcRoutine; - info->ApcContext = ApcContext; SERVER_START_REQ( read_directory_changes ) { @@ -2288,6 +2281,8 @@ NtNotifyChangeDirectoryFile( HANDLE FileHandle, HANDLE Event, req->async.callback = read_changes_apc; req->async.iosb = IoStatusBlock; req->async.arg = info; + req->async.apc = ApcRoutine; + req->async.apc_arg = ApcContext; req->async.event = Event; status = wine_server_call( req ); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 6873e0e..89de3b3 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -922,7 +922,7 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc { HANDLE internal_event = 0; - if(!event) + if(!event && !apc) { io->u.Status = NtCreateEvent(&internal_event, EVENT_ALL_ACCESS, NULL, FALSE, FALSE); if (io->u.Status != STATUS_SUCCESS) return io->u.Status; @@ -933,12 +933,14 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc req->async.callback = pipe_completion_wait; req->async.iosb = io; req->async.arg = NULL; + req->async.apc = apc; + req->async.apc_arg = apc_context; req->async.event = event ? event : internal_event; io->u.Status = wine_server_call(req); } SERVER_END_REQ; - if (!event && io->u.Status == STATUS_PENDING) + if (internal_event && io->u.Status == STATUS_PENDING) { while (NtWaitForSingleObject(internal_event, TRUE, NULL) == STATUS_USER_APC) /*nothing*/ ; } @@ -951,7 +953,7 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc HANDLE internal_event = 0; FILE_PIPE_WAIT_FOR_BUFFER *buff = in_buffer; - if(!event) + if(!event && !apc) { io->u.Status = NtCreateEvent(&internal_event, EVENT_ALL_ACCESS, NULL, FALSE, FALSE); if (io->u.Status != STATUS_SUCCESS) return io->u.Status; @@ -964,13 +966,15 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc req->async.callback = pipe_completion_wait; req->async.iosb = io; req->async.arg = NULL; + req->async.apc = apc; + req->async.apc_arg = apc_context; req->async.event = event ? event : internal_event; wine_server_add_data( req, buff->Name, buff->NameLength ); io->u.Status = wine_server_call( req ); } SERVER_END_REQ; - if (!event && io->u.Status == STATUS_PENDING) + if (internal_event && io->u.Status == STATUS_PENDING) { while (NtWaitForSingleObject(internal_event, TRUE, NULL) == STATUS_USER_APC) /*nothing*/ ; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 1e21566..a254128 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -162,6 +162,8 @@ typedef struct void *callback; void *iosb; void *arg; + void *apc; + void *apc_arg; obj_handle_t event; } async_data_t; @@ -4660,6 +4662,6 @@ union generic_reply struct allocate_locally_unique_id_reply allocate_locally_unique_id_reply; }; -#define SERVER_PROTOCOL_VERSION 288 +#define SERVER_PROTOCOL_VERSION 289 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/async.c b/server/async.c index aa4db4e..440cb2e 100644 --- a/server/async.c +++ b/server/async.c @@ -150,6 +150,16 @@ void async_set_result( struct object *obj, unsigned int status ) } else { + if (async->data.apc) + { + apc_call_t data; + data.type = APC_USER; + data.user.func = async->data.apc; + data.user.args[0] = (unsigned long)async->data.apc_arg; + data.user.args[1] = (unsigned long)async->data.iosb; + data.user.args[2] = 0; + thread_queue_apc( async->thread, NULL, &data ); + } if (async->event) set_event( async->event ); } } diff --git a/server/protocol.def b/server/protocol.def index 5105fd6..ef20235 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -178,6 +178,8 @@ typedef struct void *callback; /* client-side callback to call upon end of async */ void *iosb; /* I/O status block in client addr space */ void *arg; /* opaque user data to pass to callback */ + void *apc; /* user apc to call */ + void *apc_arg; /* argument for user apc */ obj_handle_t event; /* event to signal when done */ } async_data_t; diff --git a/server/trace.c b/server/trace.c index a332821..898998b 100644 --- a/server/trace.c +++ b/server/trace.c @@ -246,8 +246,8 @@ static void dump_apc_result( const apc_result_t *result ) static void dump_async_data( const async_data_t *data ) { - fprintf( stderr, "{callback=%p,iosb=%p,arg=%p,event=%p}", - data->callback, data->iosb, data->arg, data->event ); + fprintf( stderr, "{callback=%p,iosb=%p,arg=%p,apc=%p,apc_arg=%p,event=%p}", + data->callback, data->iosb, data->arg, data->apc, data->apc_arg, data->event ); } static void dump_luid( const luid_t *luid )

1 0

Alexandre Julliard : server: Remove the return value of the flush() method, it's not used.
by Alexandre Julliard 28 Mar '07

28 Mar '07

Module: wine Branch: master Commit: df651875ad176f5d53374a52bde15709d6e2b3dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=df651875ad176f5d53374a52b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 27 16:51:44 2007 +0200 server: Remove the return value of the flush() method, it's not used. --- server/fd.c | 3 +-- server/file.c | 14 ++++---------- server/file.h | 4 ++-- server/named_pipe.c | 23 +++++++---------------- server/serial.c | 8 +++----- 5 files changed, 17 insertions(+), 35 deletions(-) diff --git a/server/fd.c b/server/fd.c index bf5f2e0..6fe4ace 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1763,10 +1763,9 @@ void default_fd_cancel_async( struct fd *fd ) } /* default flush() routine */ -int no_flush( struct fd *fd, struct event **event ) +void no_flush( struct fd *fd, struct event **event ) { set_error( STATUS_OBJECT_TYPE_MISMATCH ); - return 0; } /* default get_file_info() routine */ diff --git a/server/file.c b/server/file.c index 193f5d3..5f5349d 100644 --- a/server/file.c +++ b/server/file.c @@ -69,7 +69,7 @@ static unsigned int file_map_access( struct object *obj, unsigned int access ); static void file_destroy( struct object *obj ); static int file_get_poll_events( struct fd *fd ); -static int file_flush( struct fd *fd, struct event **event ); +static void file_flush( struct fd *fd, struct event **event ); static enum server_fd_type file_get_info( struct fd *fd, int *flags ); static const struct object_ops file_ops = @@ -227,16 +227,10 @@ static int file_get_poll_events( struct fd *fd ) return events; } -static int file_flush( struct fd *fd, struct event **event ) +static void file_flush( struct fd *fd, struct event **event ) { - int ret = 0, unix_fd = get_unix_fd( fd ); - - if (unix_fd != -1) - { - ret = (fsync( unix_fd ) != -1); - if (!ret) file_set_error(); - } - return ret; + int unix_fd = get_unix_fd( fd ); + if (unix_fd != -1 && fsync( unix_fd ) == -1) file_set_error(); } static enum server_fd_type file_get_info( struct fd *fd, int *flags ) diff --git a/server/file.h b/server/file.h index de5bf3a..c43352a 100644 --- a/server/file.h +++ b/server/file.h @@ -35,7 +35,7 @@ struct fd_ops /* a poll() event occurred */ void (*poll_event)(struct fd *,int event); /* flush the object buffers */ - int (*flush)(struct fd *, struct event **); + void (*flush)(struct fd *, struct event **); /* get file information */ enum server_fd_type (*get_file_info)(struct fd *fd, int *flags); /* queue an async operation */ @@ -72,7 +72,7 @@ extern void fd_queue_async_timeout( struct fd *fd, const async_data_t *data, int int count, const struct timeval *timeout ); extern void default_fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); extern void default_fd_cancel_async( struct fd *fd ); -extern int no_flush( struct fd *fd, struct event **event ); +extern void no_flush( struct fd *fd, struct event **event ); extern enum server_fd_type no_get_file_info( struct fd *fd, int *flags ); extern void no_queue_async( struct fd *fd, const async_data_t *data, int type, int count); extern void no_cancel_async( struct fd *fd ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 49d319a..a763982 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -136,7 +136,7 @@ static unsigned int pipe_map_access( struct object *obj, unsigned int access ); 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 int pipe_server_flush( struct fd *fd, struct event **event ); +static void pipe_server_flush( struct fd *fd, struct event **event ); static enum server_fd_type pipe_server_get_info( struct fd *fd, int *flags ); static const struct object_ops pipe_server_ops = @@ -170,7 +170,7 @@ static const struct fd_ops pipe_server_fd_ops = static void pipe_client_dump( struct object *obj, int verbose ); static struct fd *pipe_client_get_fd( struct object *obj ); static void pipe_client_destroy( struct object *obj ); -static int pipe_client_flush( struct fd *fd, struct event **event ); +static void pipe_client_flush( struct fd *fd, struct event **event ); static enum server_fd_type pipe_client_get_info( struct fd *fd, int *flags ); static const struct object_ops pipe_client_ops = @@ -517,20 +517,15 @@ static void check_flushed( void *arg ) } } -static int pipe_server_flush( struct fd *fd, struct event **event ) +static void pipe_server_flush( struct fd *fd, struct event **event ) { struct pipe_server *server = get_fd_user( fd ); - if (!server) - return 0; - - if (server->state != ps_connected_server) - return 0; + if (!server || server->state != ps_connected_server) return; /* FIXME: if multiple threads flush the same pipe, maybe should create a list of processes to notify */ - if (server->flush_poll) - return 0; + if (server->flush_poll) return; if (pipe_data_remaining( server )) { @@ -539,20 +534,16 @@ static int pipe_server_flush( struct fd *fd, struct event **event ) /* this kind of sux - there's no unix way to be alerted when a pipe becomes empty */ server->event = create_event( NULL, NULL, 0, 0, 0 ); - if (!server->event) - return 0; + if (!server->event) return; add_timeout( &tv, 100 ); server->flush_poll = add_timeout_user( &tv, check_flushed, server ); *event = server->event; } - - return 0; } -static int pipe_client_flush( struct fd *fd, struct event **event ) +static void pipe_client_flush( struct fd *fd, struct event **event ) { /* FIXME: what do we have to do for this? */ - return 0; } static inline int is_overlapped( unsigned int options ) diff --git a/server/serial.c b/server/serial.c index 7b92fac..bcb7945 100644 --- a/server/serial.c +++ b/server/serial.c @@ -64,7 +64,7 @@ static void serial_destroy(struct object *obj); static int serial_get_poll_events( struct fd *fd ); static void serial_poll_event( struct fd *fd, int event ); static enum server_fd_type serial_get_info( struct fd *fd, int *flags ); -static int serial_flush( struct fd *fd, struct event **event ); +static void serial_flush( struct fd *fd, struct event **event ); static void serial_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); static void serial_cancel_async( struct fd *fd ); @@ -297,14 +297,12 @@ static void serial_cancel_async( struct fd *fd ) async_terminate_queue( &serial->wait_q, STATUS_CANCELLED ); } -static int serial_flush( struct fd *fd, struct event **event ) +static void serial_flush( struct fd *fd, struct event **event ) { /* MSDN says: If hFile is a handle to a communications device, * the function only flushes the transmit buffer. */ - int ret = (tcflush( get_unix_fd(fd), TCOFLUSH ) != -1); - if (!ret) file_set_error(); - return ret; + if (tcflush( get_unix_fd(fd), TCOFLUSH ) == -1) file_set_error(); } DECL_HANDLER(get_serial_info)

1 0