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

Jacek Caban : mshtml: Fixed a typo.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: c43875cedadb8f1ac482ea2698d97738820706ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=c43875cedadb8f1ac482ea269… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 27 02:57:14 2007 +0200 mshtml: Fixed a typo. --- dlls/mshtml/nsembed.c | 4 ++-- dlls/mshtml/nsiface.idl | 2 +- dlls/mshtml/nsservice.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 6b4e918..0697d4d 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -259,8 +259,8 @@ static void set_profile(void) static const WCHAR wszMSHTML[] = {'M','S','H','T','M','L',0}; - nsres = nsIServiceManager_GetServiceByContactID(pServMgr, NS_PROFILE_CONTRACTID, - &IID_nsIProfile, (void**)&profile); + nsres = nsIServiceManager_GetServiceByContractID(pServMgr, NS_PROFILE_CONTRACTID, + &IID_nsIProfile, (void**)&profile); if(NS_FAILED(nsres)) { ERR("Could not get profile service: %08x\n", nsres); return; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 983e38a..78e030b 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -120,7 +120,7 @@ typedef nsISupports nsIControllerCommandTable; interface nsIServiceManager : nsISupports { nsresult GetService(nsCIDRef aClass, nsIIDRef aIID, void **result); - nsresult GetServiceByContactID(const char *aContactID, nsIIDRef aIID, void **result); + nsresult GetServiceByContractID(const char *aContractID, nsIIDRef aIID, void **result); nsresult IsServiceInstantiated(nsCIDRef aClass, nsIIDRef aIID, BOOL *_retval); nsresult IsServiceInstantiatedByContractID(const char *aContractID, nsIIDRef aIID, BOOL *_retval); } diff --git a/dlls/mshtml/nsservice.c b/dlls/mshtml/nsservice.c index d4c9d6b..8782306 100644 --- a/dlls/mshtml/nsservice.c +++ b/dlls/mshtml/nsservice.c @@ -465,7 +465,7 @@ void register_nsservice(nsIComponentRegistrar *registrar, nsIServiceManager *ser if(NS_FAILED(nsres)) ERR("RegisterFactory failed: %08x\n", nsres); - nsres = nsIServiceManager_GetServiceByContactID(service_manager, NS_WINDOWWATCHER_CONTRACTID, + nsres = nsIServiceManager_GetServiceByContractID(service_manager, NS_WINDOWWATCHER_CONTRACTID, &IID_nsIWindowWatcher, (void**)&window_watcher); if(NS_SUCCEEDED(nsres)) { nsres = nsIWindowWatcher_SetWindowCreator(window_watcher,

1 0

Misha Koshelev : urlmon/tests: Rename received_data event to more general name event_complete.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: 9f31fb2fd466ed0098f34c6558283023cf5fdd86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f31fb2fd466ed0098f34c655… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Fri Jul 27 00:39:17 2007 -0500 urlmon/tests: Rename received_data event to more general name event_complete. --- dlls/urlmon/tests/protocol.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 45ba841..2b79cdd 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -104,7 +104,7 @@ static int state = 0; static DWORD bindf = 0; static IInternetBindInfo *prot_bind_info; static void *expect_pv; -static HANDLE received_data; +static HANDLE event_complete; static enum { FILE_TEST, @@ -419,7 +419,7 @@ static HRESULT WINAPI ProtocolSink_ReportData(IInternetProtocolSink *iface, DWOR } if (!(bindf & BINDF_FROMURLMON)) - SetEvent(received_data); + SetEvent(event_complete); } return S_OK; } @@ -1250,7 +1250,7 @@ static void test_http_protocol_url(LPCWSTR url, BOOL is_first) } else { - WaitForSingleObject(received_data, INFINITE); + WaitForSingleObject(event_complete, INFINITE); SendMessage(protocol_hwnd, WM_USER, 0, 0); } @@ -1299,7 +1299,7 @@ static HRESULT http_protocol_read(void) hres = IInternetProtocol_Read(http_protocol, buf, sizeof(buf), &cb); if(!(bindf & BINDF_FROMURLMON) && hres == E_PENDING) { - WaitForSingleObject(received_data, INFINITE); + WaitForSingleObject(event_complete, INFINITE); CHECK_CALLED(ReportData); SET_EXPECT(ReportData); } else if(cb == 0) break; @@ -1554,7 +1554,7 @@ START_TEST(protocol) { OleInitialize(NULL); - received_data = CreateEvent(NULL, FALSE, FALSE, NULL); + event_complete = CreateEvent(NULL, FALSE, FALSE, NULL); protocol_hwnd = create_protocol_window(); test_file_protocol(); @@ -1563,7 +1563,7 @@ START_TEST(protocol) test_CreateBinding(); DestroyWindow(protocol_hwnd); - CloseHandle(received_data); + CloseHandle(event_complete); OleUninitialize(); }

1 0

James Hawkins : msi: Initialize the size parameter.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: fb45206ed7f99dff600f220b53d7831f375b059c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb45206ed7f99dff600f220b5… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jul 26 17:34:10 2007 -0700 msi: Initialize the size parameter. --- dlls/msi/custom.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index cc08c29..54efc85 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -842,6 +842,7 @@ static UINT HANDLE_CustomType23(MSIPACKAGE *package, LPCWSTR source, static const WCHAR backslash[] = {'\\',0}; + size = MAX_PATH; MSI_GetPropertyW(package, cszSourceDir, package_path, &size); lstrcatW(package_path, backslash); lstrcatW(package_path, source);

1 0

James Hawkins : msi: Add more tests for MSIMODIFY_UPDATE.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: b0ac20e951a65e22836fbc92494770f459545764 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0ac20e951a65e22836fbc924… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jul 26 17:33:26 2007 -0700 msi: Add more tests for MSIMODIFY_UPDATE. --- dlls/msi/tests/db.c | 186 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 186 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 5b01189..0fbee89 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -3781,6 +3781,191 @@ static void test_select_markers(void) DeleteFile(msifile); } +static void test_viewmodify_update(void) +{ + MSIHANDLE hdb = 0, hview = 0, hrec = 0; + const char *query; + UINT r; + + DeleteFile(msifile); + + r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); + ok(r == ERROR_SUCCESS, "MsiOpenDatabase failed\n"); + + query = "CREATE TABLE `table` (`A` INT, `B` INT PRIMARY KEY `A`)"; + r = run_query( hdb, 0, query ); + ok(r == ERROR_SUCCESS, "query failed\n"); + + query = "INSERT INTO `table` (`A`, `B`) VALUES (1, 2)"; + r = run_query( hdb, 0, query ); + ok(r == ERROR_SUCCESS, "query failed\n"); + + query = "INSERT INTO `table` (`A`, `B`) VALUES (3, 4)"; + r = run_query( hdb, 0, query ); + ok(r == ERROR_SUCCESS, "query failed\n"); + + query = "INSERT INTO `table` (`A`, `B`) VALUES (5, 6)"; + r = run_query( hdb, 0, query ); + ok(r == ERROR_SUCCESS, "query failed\n"); + + query = "SELECT `B` FROM `table`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + + r = MsiRecordSetInteger(hrec, 1, 0); + ok(r == ERROR_SUCCESS, "failed to set integer\n"); + + r = MsiViewModify(hview, MSIMODIFY_UPDATE, hrec); + ok(r == ERROR_SUCCESS, "MsiViewModify failed: %d\n", r); + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + query = "SELECT * FROM `table`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + + r = MsiRecordGetInteger(hrec, 1); + ok(r == 1, "Expected 1, got %d\n", r); + r = MsiRecordGetInteger(hrec, 2); + todo_wine + { + ok(r == 0, "Expected 0, got %d\n", r); + } + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + + r = MsiRecordGetInteger(hrec, 1); + ok(r == 3, "Expected 3, got %d\n", r); + r = MsiRecordGetInteger(hrec, 2); + ok(r == 4, "Expected 4, got %d\n", r); + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + + r = MsiRecordGetInteger(hrec, 1); + ok(r == 5, "Expected 5, got %d\n", r); + r = MsiRecordGetInteger(hrec, 2); + ok(r == 6, "Expected 6, got %d\n", r); + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + /* loop through all elements */ + query = "SELECT `B` FROM `table`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + + while (TRUE) + { + r = MsiViewFetch(hview, &hrec); + if (r != ERROR_SUCCESS) + break; + + r = MsiRecordSetInteger(hrec, 1, 0); + ok(r == ERROR_SUCCESS, "failed to set integer\n"); + + r = MsiViewModify(hview, MSIMODIFY_UPDATE, hrec); + ok(r == ERROR_SUCCESS, "MsiViewModify failed: %d\n", r); + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + } + + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + query = "SELECT * FROM `table`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + + r = MsiRecordGetInteger(hrec, 1); + ok(r == 1, "Expected 1, got %d\n", r); + r = MsiRecordGetInteger(hrec, 2); + todo_wine + { + ok(r == 0, "Expected 0, got %d\n", r); + } + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + + r = MsiRecordGetInteger(hrec, 1); + ok(r == 3, "Expected 3, got %d\n", r); + r = MsiRecordGetInteger(hrec, 2); + todo_wine + { + ok(r == 0, "Expected 0, got %d\n", r); + } + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + + r = MsiRecordGetInteger(hrec, 1); + ok(r == 5, "Expected 5, got %d\n", r); + r = MsiRecordGetInteger(hrec, 2); + todo_wine + { + ok(r == 0, "Expected 0, got %d\n", r); + } + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + r = MsiCloseHandle( hdb ); + ok(r == ERROR_SUCCESS, "MsiOpenDatabase close failed\n"); +} + START_TEST(db) { test_msidatabase(); @@ -3805,4 +3990,5 @@ START_TEST(db) test_update(); test_special_tables(); test_select_markers(); + test_viewmodify_update(); }

1 0

Maarten Lankhorst : winmm: Don't operate on freed data in timer.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: 93b6f158263772493c6ebb712bbf2e96427e4474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93b6f158263772493c6ebb712… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Jul 19 11:34:48 2007 +0200 winmm: Don't operate on freed data in timer. --- dlls/winmm/time.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index 827f87a..2092540 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -359,6 +359,7 @@ MMRESULT WINAPI timeSetEvent(UINT wDelay, UINT wResol, LPTIMECALLBACK lpFunc, MMRESULT WINAPI timeKillEvent(UINT wID) { WINE_TIMERENTRY *lpSelf = NULL, *lpTimer; + DWORD wFlags; TRACE("(%u)\n", wID); EnterCriticalSection(&WINMM_cs); @@ -378,10 +379,11 @@ MMRESULT WINAPI timeKillEvent(UINT wID) WARN("wID=%u is not a valid timer ID\n", wID); return MMSYSERR_INVALPARAM; } - if (lpSelf->wFlags & TIME_KILL_SYNCHRONOUS) + wFlags = lpSelf->wFlags; + if (wFlags & TIME_KILL_SYNCHRONOUS) EnterCriticalSection(&TIME_cbcrst); HeapFree(GetProcessHeap(), 0, lpSelf); - if (lpSelf->wFlags & TIME_KILL_SYNCHRONOUS) + if (wFlags & TIME_KILL_SYNCHRONOUS) LeaveCriticalSection(&TIME_cbcrst); return TIMERR_NOERROR; }

1 0

Maarten Lankhorst : dsound: Allow mixing the same buffer multiple times if we are looping.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: f3ed32bca0566ab4ce5ccb7b93b754f41be22fd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3ed32bca0566ab4ce5ccb7b9… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Jul 12 13:21:43 2007 +0200 dsound: Allow mixing the same buffer multiple times if we are looping. --- dlls/dsound/mixer.c | 46 ++++++++++++++++++++++++++++++---------------- 1 files changed, 30 insertions(+), 16 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index f2bee0d..b5af5fb 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -543,6 +543,12 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, DWORD writepos, DWO dsb->leadin = FALSE; } + /* check for notification positions */ + if (dsb->dsbd.dwFlags & DSBCAPS_CTRLPOSITIONNOTIFY && + dsb->state != STATE_STARTING) { + DSOUND_CheckEvent(dsb, dsb->buf_mixpos, ilen); + } + dsb->buf_mixpos += ilen; if (dsb->buf_mixpos >= dsb->buflen) { @@ -557,6 +563,9 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, DWORD writepos, DWO } } + /* increase mix position */ + dsb->primary_mixpos += len; + dsb->primary_mixpos %= dsb->device->buflen; return len; } @@ -607,27 +616,32 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, DWORD playpos, DWORD wri } /* take into acount already mixed data */ - mixlen = mixlen - primary_done; - - TRACE("mixlen (primary) = %i\n", mixlen); - - /* clip to valid length */ - mixlen = (buflen < mixlen) ? buflen : mixlen; + mixlen -= primary_done; - TRACE("primary_done=%d, mixlen (buffer)=%d\n", primary_done, mixlen); + TRACE("primary_done=%d, mixlen (primary) = %i\n", primary_done, mixlen); - /* mix more data */ - mixlen = DSOUND_MixInBuffer(dsb, dsb->primary_mixpos, mixlen); + if ((dsb->playflags & DSBPLAY_LOOPING) && mixlen > buflen) + { + while (mixlen > buflen) + { + DWORD mixedlength = DSOUND_MixInBuffer(dsb, dsb->primary_mixpos, buflen); + mixlen -= buflen; + if (!mixedlength) + { + mixlen = 0; + break; + } + } - /* check for notification positions */ - if (dsb->dsbd.dwFlags & DSBCAPS_CTRLPOSITIONNOTIFY && - dsb->state != STATE_STARTING) { - DSOUND_CheckEvent(dsb, writepos, mixlen / dsb->device->pwfx->nBlockAlign * dsb->pwfx->nBlockAlign); } - /* increase mix position */ - dsb->primary_mixpos += mixlen; - dsb->primary_mixpos %= dsb->device->buflen; + /* clip to valid length */ + mixlen = (buflen < mixlen) ? buflen : mixlen; + TRACE("mixlen (buffer)=%d\n", mixlen); + + if (mixlen) + /* mix more data */ + mixlen = DSOUND_MixInBuffer(dsb, dsb->primary_mixpos, mixlen); TRACE("new primary_mixpos=%d, mixed data len=%d, buffer left = %d\n", dsb->primary_mixpos, mixlen, (dsb->buflen - dsb->buf_mixpos));

1 0

Maarten Lankhorst : winealsa: Minor fixes to ds output.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: 3c8c02a39352f1f72603ec067793e334f194fd7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c8c02a39352f1f72603ec067… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Jul 19 00:58:23 2007 +0200 winealsa: Minor fixes to ds output. --- dlls/winealsa.drv/dsoutput.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index 7990a0f..dbac200 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -157,7 +157,7 @@ static void CheckXRUN(IDsDriverBufferImpl* This) ERR("recovery from suspend failed, prepare failed: %s\n", snd_strerror(err)); } } else if ( state != SND_PCM_STATE_RUNNING ) { - WARN("Unhandled state: %d\n", state); + FIXME("Unhandled state: %d\n", state); } } @@ -490,9 +490,12 @@ static HRESULT WINAPI IDsDriverBufferImpl_GetPosition(PIDSDRIVERBUFFER iface, state = snd_pcm_state(This->pcm); - if (state != SND_PCM_STATE_RUNNING) + if (state != SND_PCM_STATE_PREPARED && state != SND_PCM_STATE_RUNNING) + { CheckXRUN(This); - else + state = snd_pcm_state(This->pcm); + } + if (state == SND_PCM_STATE_RUNNING) { snd_pcm_uframes_t used = CommitAll(This);

1 0

Maarten Lankhorst : wineoss: Make sure writepos < buflen for dsrender.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: 7107a6969d2c2f163d991356a2f5237d2bbb1173 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7107a6969d2c2f163d991356a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Jul 24 18:23:42 2007 +0200 wineoss: Make sure writepos < buflen for dsrender. --- dlls/wineoss.drv/dsrender.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineoss.drv/dsrender.c b/dlls/wineoss.drv/dsrender.c index f73624e..aa9d373 100644 --- a/dlls/wineoss.drv/dsrender.c +++ b/dlls/wineoss.drv/dsrender.c @@ -579,7 +579,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_GetPosition(PIDSDRIVERBUFFER iface, *lpdwWrite = ptr + 32; else *lpdwWrite = ptr + WOutDev[This->drv->wDevID].dwFragmentSize; - while (*lpdwWrite > This->buflen) + while (*lpdwWrite >= This->buflen) *lpdwWrite -= This->buflen; } TRACE("playpos=%d, writepos=%d\n", lpdwPlay?*lpdwPlay:0, lpdwWrite?*lpdwWrite:0);

1 0

Steven Edwards : version: VerQueryValueA/W NULL pointer check.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: e1347ecdc5a588a41c7cd5864e39ca13c65da4fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1347ecdc5a588a41c7cd5864… Author: Steven Edwards <winehacker(a)gmail.com> Date: Thu Jul 26 15:42:16 2007 -0400 version: VerQueryValueA/W NULL pointer check. --- dlls/version/info.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/version/info.c b/dlls/version/info.c index 82ca86f..907cd23 100644 --- a/dlls/version/info.c +++ b/dlls/version/info.c @@ -771,6 +771,9 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock, TRACE("(%p,%s,%p,%p)\n", pBlock, debugstr_a(lpSubBlock), lplpBuffer, puLen ); + if (!pBlock) + return FALSE; + if ( !VersionInfoIs16( info ) ) { BOOL ret; @@ -823,6 +826,9 @@ BOOL WINAPI VerQueryValueW( LPCVOID pBlock, LPCWSTR lpSubBlock, TRACE("(%p,%s,%p,%p)\n", pBlock, debugstr_w(lpSubBlock), lplpBuffer, puLen ); + if (!pBlock) + return FALSE; + if ( VersionInfoIs16( info ) ) { BOOL ret;

1 0

Andrew Talbot : oleaut32: Constify some variables.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: 16e9c35910ae78a8c5cd7a5c11da4cf75b9ddf7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=16e9c35910ae78a8c5cd7a5c1… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jul 26 22:24:58 2007 +0100 oleaut32: Constify some variables. --- dlls/oleaut32/typelib2.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 874d8a8..41ee8e6 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -322,7 +322,7 @@ static int ctl2_find_guid( */ static int ctl2_find_name( ICreateTypeLib2Impl *This, /* [I] The typelib to operate against. */ - char *name) /* [I] The encoded name to find. */ + const char *name) /* [I] The encoded name to find. */ { int offset; int *namestruct; @@ -331,7 +331,7 @@ static int ctl2_find_name( while (offset != -1) { namestruct = (int *)&This->typelib_segment_data[MSFT_SEG_NAME][offset]; - if (!((namestruct[2] ^ *((int *)name)) & 0xffff00ff)) { + if (!((namestruct[2] ^ *((const int *)name)) & 0xffff00ff)) { /* hash codes and lengths match, final test */ if (!strncasecmp(name+4, (void *)(namestruct+3), name[0])) break; } @@ -828,7 +828,7 @@ static HRESULT ctl2_set_custdata( */ static int ctl2_encode_typedesc( ICreateTypeLib2Impl *This, /* [I] The type library in which to encode the TYPEDESC. */ - TYPEDESC *tdesc, /* [I] The type description to encode. */ + const TYPEDESC *tdesc, /* [I] The type description to encode. */ int *encoded_tdesc, /* [O] The encoded type description. */ int *width, /* [O] The width of the type, or NULL. */ int *alignment, /* [O] The alignment of the type, or NULL. */ @@ -3225,7 +3225,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetLibFlags(ICreateTypeLib2 * iface, UIN return S_OK; } -static int ctl2_write_chunk(HANDLE hFile, void *segment, int length) +static int ctl2_write_chunk(HANDLE hFile, const void *segment, int length) { DWORD dwWritten; if (!WriteFile(hFile, segment, length, &dwWritten, 0)) {

1 0