February 2010 - Wine-Commits

Jörg Höhle : wineoss: Do not access WAVEHDR past DriverCallback.
by Alexandre Julliard Feb. 22, 2010

Feb. 22, 2010

Module: wine Branch: master Commit: 4cff4c82a167308cb62a1f98fd45ad088c993dac URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cff4c82a167308cb62a1f98f… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Feb 20 16:34:59 2010 +0100 wineoss: Do not access WAVEHDR past DriverCallback. --- dlls/wineoss.drv/audio.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c index cd89cb7..ba42358 100644 --- a/dlls/wineoss.drv/audio.c +++ b/dlls/wineoss.drv/audio.c @@ -2806,15 +2806,15 @@ static DWORD CALLBACK widRecorder(LPVOID pmt) widRecorder_ReadHeaders(wwi); /* return all buffers to the app */ - for (lpWaveHdr = wwi->lpQueuePtr; lpWaveHdr; lpWaveHdr = lpWaveHdr->lpNext) { + while (wwi->lpQueuePtr) { + lpWaveHdr = wwi->lpQueuePtr; TRACE("reset %p %p\n", lpWaveHdr, lpWaveHdr->lpNext); + wwi->lpQueuePtr = lpWaveHdr->lpNext; lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; lpWaveHdr->dwFlags |= WHDR_DONE; - wwi->lpQueuePtr = lpWaveHdr->lpNext; widNotifyClient(wwi, WIM_DATA, (DWORD_PTR)lpWaveHdr, 0); } - wwi->lpQueuePtr = NULL; SetEvent(ev); break; case WINE_WM_UPDATE:

1 0

Jörg Höhle : midimap: Have GetDevCaps error out when no MIDI device is present.
by Alexandre Julliard Feb. 22, 2010

Feb. 22, 2010

Module: wine Branch: master Commit: e1cf94d9da1d4f6928165d7a78fc408b99f28425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1cf94d9da1d4f6928165d7a7… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Feb 18 17:37:25 2010 +0100 midimap: Have GetDevCaps error out when no MIDI device is present. --- dlls/midimap/midimap.c | 1 + dlls/winmm/tests/midi.c | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index 77b8596..a55c722 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -470,6 +470,7 @@ static DWORD modGetDevCaps(UINT wDevID, MIDIMAPDATA* mom, LPMIDIOUTCAPSW lpMidiC MIDICAPS_VOLUME|MIDICAPS_LRVOLUME }; if (lpMidiCaps == NULL) return MMSYSERR_INVALPARAM; + if (!numMidiOutPorts) return MMSYSERR_BADDEVICEID; memcpy(lpMidiCaps, &mappercaps, min(size, sizeof(*lpMidiCaps))); return MMSYSERR_NOERROR; diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 4038d41..eea066d 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -437,7 +437,13 @@ static void test_midi_outfns(HWND hwnd) ok(!rc, "midiOutClose rc=%s\n", mmsys_error(rc)); } if (!ndevs) { + MIDIOUTCAPSA capsA; skip("Found no MIDI out device\n"); + + rc = midiOutGetDevCapsA(MIDIMAPPER, &capsA, sizeof(capsA)); + /* GetDevCaps and Open must return compatible results */ + ok(rc==MMSYSERR_BADDEVICEID || broken(rc==MMSYSERR_NODRIVER /*nt,w2k*/), "midiOutGetDevCaps MAPPER with no MIDI rc=%s\n", mmsys_error(rc)); + rc = midiOutOpen(&hm, MIDIMAPPER, 0, 0, CALLBACK_NULL); if (rc==MIDIERR_INVALIDSETUP) todo_wine /* Wine without snd-seq */ ok(rc==MMSYSERR_BADDEVICEID || broken(rc==MMSYSERR_NODRIVER /*w2k*/), "midiOutOpen MAPPER with no MIDI rc=%s\n", mmsys_error(rc));

1 0

Hans Leidekker : wininet: Fix handling of a response without headers.
by Alexandre Julliard Feb. 22, 2010

Feb. 22, 2010

Module: wine Branch: master Commit: 2ed570ecc6eef5f5a9e70d44fc0912c02a36bf1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ed570ecc6eef5f5a9e70d44f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 22 12:28:03 2010 +0100 wininet: Fix handling of a response without headers. --- dlls/wininet/http.c | 15 ++++++++++++++- dlls/wininet/tests/http.c | 8 ++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 5b1bb22..62c3953 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -73,6 +73,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); static const WCHAR g_szHttp1_0[] = {'H','T','T','P','/','1','.','0',0}; static const WCHAR g_szHttp1_1[] = {'H','T','T','P','/','1','.','1',0}; +static const WCHAR szOK[] = {'O','K',0}; +static const WCHAR szDefaultHeader[] = {'H','T','T','P','/','1','.','0',' ','2','0','0',' ','O','K',0}; static const WCHAR hostW[] = { 'H','o','s','t',0 }; static const WCHAR szAuthorization[] = { 'A','u','t','h','o','r','i','z','a','t','i','o','n',0 }; static const WCHAR szProxy_Authorization[] = { 'P','r','o','x','y','-','A','u','t','h','o','r','i','z','a','t','i','o','n',0 }; @@ -4474,7 +4476,18 @@ static INT HTTP_GetResponseHeaders(http_request_t *lpwhr, BOOL clear) } else if (!codeHundred) { - FIXME("Non status line at head of response (%s)\n",debugstr_w(buffer)); + WARN("No status line at head of response (%s)\n", debugstr_w(buffer)); + + HeapFree(GetProcessHeap(), 0, lpwhr->lpszVersion); + HeapFree(GetProcessHeap(), 0, lpwhr->lpszStatusText); + + lpwhr->lpszVersion = heap_strdupW(g_szHttp1_0); + lpwhr->lpszStatusText = heap_strdupW(szOK); + + HeapFree(GetProcessHeap(), 0, lpwhr->lpszRawHeaders); + lpwhr->lpszRawHeaders = heap_strdupW(szDefaultHeader); + + bSuccess = TRUE; goto lend; } } while (codeHundred); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 5d57549..0faeb54 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2290,22 +2290,22 @@ static void test_response_without_headers(int port) size = sizeof(buffer); SetLastError(0xdeadbeef); r = HttpQueryInfo(hr, HTTP_QUERY_STATUS_TEXT, buffer, &size, NULL ); - todo_wine ok(r, "HttpQueryInfo failed %u\n", GetLastError()); - todo_wine ok(!strcmp(buffer, "OK"), "expected OK got: \"%s\"\n", buffer); + ok(r, "HttpQueryInfo failed %u\n", GetLastError()); + ok(!strcmp(buffer, "OK"), "expected OK got: \"%s\"\n", buffer); buffer[0] = 0; size = sizeof(buffer); SetLastError(0xdeadbeef); r = HttpQueryInfo(hr, HTTP_QUERY_VERSION, buffer, &size, NULL); ok(r, "HttpQueryInfo failed %u\n", GetLastError()); - todo_wine ok(!strcmp(buffer, "HTTP/1.0"), "expected HTTP/1.0 got: \"%s\"\n", buffer); + ok(!strcmp(buffer, "HTTP/1.0"), "expected HTTP/1.0 got: \"%s\"\n", buffer); buffer[0] = 0; size = sizeof(buffer); SetLastError(0xdeadbeef); r = HttpQueryInfo(hr, HTTP_QUERY_RAW_HEADERS, buffer, &size, NULL); ok(r, "HttpQueryInfo failed %u\n", GetLastError()); - todo_wine ok(!strcmp(buffer, "HTTP/1.0 200 OK"), "raw headers wrong: \"%s\"\n", buffer); + ok(!strcmp(buffer, "HTTP/1.0 200 OK"), "raw headers wrong: \"%s\"\n", buffer); InternetCloseHandle(hr); InternetCloseHandle(hc);

1 0

Jörg Höhle : user32: Sync vkey codes with winuser .h.
by Alexandre Julliard Feb. 22, 2010

Feb. 22, 2010

Module: wine Branch: master Commit: d25b9cebff14f562042947ee354b154d09dec998 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d25b9cebff14f562042947ee3… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Feb 16 09:04:07 2010 +0100 user32: Sync vkey codes with winuser.h. --- dlls/user32/spy.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index a3c7b3c..1ed768f 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -1166,10 +1166,10 @@ static const char * const VK_KeyNames[SPY_MAX_VKKEYSNUM + 1] = NULL, /* 0x19 */ NULL, /* 0x1A */ "VK_ESCAPE", /* 0x1B */ - NULL, /* 0x1C */ - NULL, /* 0x1D */ - NULL, /* 0x1E */ - NULL, /* 0x1F */ + "VK_CONVERT", /* 0x1C */ + "VK_NONCONVERT", /* 0x1D */ + "VK_ACCEPT", /* 0x1E */ + "VK_MODECHANGE", /* 0x1F */ "VK_SPACE", /* 0x20 */ "VK_PRIOR", /* 0x21 */ "VK_NEXT", /* 0x22 */ @@ -1233,7 +1233,7 @@ static const char * const VK_KeyNames[SPY_MAX_VKKEYSNUM + 1] = "VK_RWIN", /* 0x5C */ "VK_APPS", /* 0x5D */ NULL, /* 0x5E */ - NULL, /* 0x5F */ + "VK_SLEEP", /* 0x5F */ "VK_NUMPAD0", /* 0x60 */ "VK_NUMPAD1", /* 0x61 */ "VK_NUMPAD2", /* 0x62 */ @@ -1284,11 +1284,11 @@ static const char * const VK_KeyNames[SPY_MAX_VKKEYSNUM + 1] = NULL, /* 0x8F */ "VK_NUMLOCK", /* 0x90 */ "VK_SCROLL", /* 0x91 */ - NULL, /* 0x92 */ - NULL, /* 0x93 */ - NULL, /* 0x94 */ - NULL, /* 0x95 */ - NULL, /* 0x96 */ + "VK_OEM_NEC_EQUAL", /* 0x92 aka. VK_OEM_FJ_JISHO */ + "VK_OEM_FJ_MASSHOU", /* 0x93 */ + "VK_OEM_FJ_TOUROKU", /* 0x94 */ + "VK_OEM_FJ_LOYA", /* 0x95 */ + "VK_OEM_FJ_ROYA", /* 0x96 */ NULL, /* 0x97 */ NULL, /* 0x98 */ NULL, /* 0x99 */

1 0

Jörg Höhle : winealsa: Do not access WAVEHDR past DriverCallback.
by Alexandre Julliard Feb. 22, 2010

Feb. 22, 2010

Module: wine Branch: master Commit: bdea146639b189d9b3f373c38de25cba39c9e10c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdea146639b189d9b3f373c38… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Feb 20 17:27:50 2010 +0100 winealsa: Do not access WAVEHDR past DriverCallback. --- dlls/winealsa.drv/wavein.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index d6337bc..625e36e 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -292,15 +292,15 @@ static DWORD CALLBACK widRecorder(LPVOID pmt) widRecorder_ReadHeaders(wwi); /* return all buffers to the app */ - for (lpWaveHdr = wwi->lpQueuePtr; lpWaveHdr; lpWaveHdr = lpWaveHdr->lpNext) { + while (wwi->lpQueuePtr) { + lpWaveHdr = wwi->lpQueuePtr; TRACE("reset %p %p\n", lpWaveHdr, lpWaveHdr->lpNext); + wwi->lpQueuePtr = lpWaveHdr->lpNext; lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; lpWaveHdr->dwFlags |= WHDR_DONE; - wwi->lpQueuePtr = lpWaveHdr->lpNext; widNotifyClient(wwi, WIM_DATA, (DWORD_PTR)lpWaveHdr, 0); } - wwi->lpQueuePtr = NULL; SetEvent(ev); break; case WINE_WM_CLOSING:

1 0

Hans Leidekker : msi/tests: Free exception information.
by Alexandre Julliard Feb. 22, 2010

Feb. 22, 2010

Module: wine Branch: master Commit: a620a84f4c76d07f00a84c78f55ae8cc3e093a1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a620a84f4c76d07f00a84c78f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 22 12:25:45 2010 +0100 msi/tests: Free exception information. Found by Valgrind. --- dlls/msi/tests/automation.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index edc6cbe..99fb778 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1808,6 +1808,7 @@ static void test_Session(IDispatch *pSession) static WCHAR szEmpty[] = { 0 }; static WCHAR szEquals[] = { '=',0 }; static WCHAR szPropertyName[] = { 'P','r','o','p','e','r','t','y',',','N','a','m','e',0 }; + static WCHAR szModeFlag[] = { 'M','o','d','e',',','F','l','a','g',0 }; WCHAR stringw[MAX_PATH]; CHAR string[MAX_PATH]; UINT len; @@ -1880,14 +1881,19 @@ static void test_Session(IDispatch *pSession) hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, TRUE); todo_wine ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); + if (hr == DISP_E_EXCEPTION) ok_exception(hr, szModeFlag); + hr = Session_ModeGet(pSession, MSIRUNMODE_REBOOTNOW, &bool); ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr); ok(bool, "Reboot now mode is %d, expected 1\n", bool); + hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, FALSE); /* set it again so we don't reboot */ todo_wine ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); + if (hr == DISP_E_EXCEPTION) ok_exception(hr, szModeFlag); hr = Session_ModePut(pSession, MSIRUNMODE_MAINTENANCE, TRUE); ok(hr == DISP_E_EXCEPTION, "Session_ModePut failed, hresult 0x%08x\n", hr); + ok_exception(hr, szModeFlag); /* Session::Database, get */ hr = Session_Database(pSession, &pDatabase);

1 0

Hans Leidekker : kernel32/tests: Fix a thread handle leak.
by Alexandre Julliard Feb. 22, 2010

Feb. 22, 2010

Module: wine Branch: master Commit: b7696db161e7b220a36f4e3be2475c51f77eaa45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7696db161e7b220a36f4e3be… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 22 12:27:01 2010 +0100 kernel32/tests: Fix a thread handle leak. --- dlls/kernel32/tests/change.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index 50d899a..08d1417 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -79,6 +79,7 @@ static DWORD FinishNotificationThread(HANDLE thread) ok(status == WAIT_OBJECT_0, "WaitForSingleObject status %d error %d\n", status, GetLastError()); ok(GetExitCodeThread(thread, &exitcode), "Could not retrieve thread exit code\n"); + CloseHandle(thread); return exitcode; }

1 0

Hans Leidekker : winhttp: Add support for resolve timeouts.
by Alexandre Julliard Feb. 22, 2010

Feb. 22, 2010

Module: wine Branch: master Commit: b467efb5c834070ebc759a8fbe75068755dd31e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b467efb5c834070ebc759a8fb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 22 12:27:30 2010 +0100 winhttp: Add support for resolve timeouts. --- dlls/winhttp/net.c | 63 +++++++++++++-- dlls/winhttp/request.c | 2 +- dlls/winhttp/session.c | 30 ++++++- dlls/winhttp/tests/winhttp.c | 171 ++++++++++++++++++++++++++++++++++++++++ dlls/winhttp/winhttp_private.h | 4 +- 5 files changed, 257 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b467efb5c834070ebc759…

1 0

Hans Leidekker : fusion: Add a stub implementation of CreateApplicationContext.
by Alexandre Julliard Feb. 22, 2010

Feb. 22, 2010

Module: wine Branch: master Commit: 68ab79992426f459b0fff26360a368dccb3b25ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=68ab79992426f459b0fff2636… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 22 12:26:34 2010 +0100 fusion: Add a stub implementation of CreateApplicationContext. --- dlls/fusion/fusion.c | 9 +++++++++ dlls/fusion/fusion.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/fusion/fusion.c b/dlls/fusion/fusion.c index 7c94100..ad77233 100644 --- a/dlls/fusion/fusion.c +++ b/dlls/fusion/fusion.c @@ -52,6 +52,15 @@ HRESULT WINAPI CreateInstallReferenceEnum(IInstallReferenceEnum **ppRefEnum, return E_NOTIMPL; } +/****************************************************************** + * CreateApplicationContext (FUSION.@) + */ +HRESULT WINAPI CreateApplicationContext(IAssemblyName *name, void *ctx) +{ + FIXME("%p, %p\n", name, ctx); + return E_NOTIMPL; +} + static HRESULT (WINAPI *pGetCORVersion)(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwLength); diff --git a/dlls/fusion/fusion.spec b/dlls/fusion/fusion.spec index e589ad1..54e4ead 100644 --- a/dlls/fusion/fusion.spec +++ b/dlls/fusion/fusion.spec @@ -1,6 +1,6 @@ @ stub CopyPDBs @ stdcall ClearDownloadCache() -@ stub CreateApplicationContext +@ stdcall CreateApplicationContext(ptr ptr) @ stdcall CreateAssemblyCache(ptr long) @ stdcall CreateAssemblyEnum(ptr ptr ptr long ptr) @ stdcall CreateAssemblyNameObject(ptr wstr long ptr)

1 0

Hans Leidekker : msi: Allocate sufficient memory in ITERATE_InstallODBCDriver and ITERATE_InstallODBCTranslator .
by Alexandre Julliard Feb. 22, 2010

Feb. 22, 2010

Module: wine Branch: master Commit: 587e107398eceb101ea296e18e8ab5fb0b2405bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=587e107398eceb101ea296e18… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 22 12:26:09 2010 +0100 msi: Allocate sufficient memory in ITERATE_InstallODBCDriver and ITERATE_InstallODBCTranslator. Found by Valgrind. --- dlls/msi/action.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 20929c6..7655268 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5110,7 +5110,7 @@ static UINT ITERATE_InstallODBCDriver( MSIRECORD *rec, LPVOID param ) len = lstrlenW(desc) + lstrlenW(driver_fmt) + lstrlenW(driver_file->FileName); if (setup_file) len += lstrlenW(setup_fmt) + lstrlenW(setup_file->FileName); - len += lstrlenW(usage_fmt) + 1; + len += lstrlenW(usage_fmt) + 2; /* \0\0 */ driver = msi_alloc(len * sizeof(WCHAR)); if (!driver) @@ -5120,13 +5120,13 @@ static UINT ITERATE_InstallODBCDriver( MSIRECORD *rec, LPVOID param ) lstrcpyW(ptr, desc); ptr += lstrlenW(ptr) + 1; - sprintfW(ptr, driver_fmt, driver_file->FileName); - ptr += lstrlenW(ptr) + 1; + len = sprintfW(ptr, driver_fmt, driver_file->FileName); + ptr += len + 1; if (setup_file) { - sprintfW(ptr, setup_fmt, setup_file->FileName); - ptr += lstrlenW(ptr) + 1; + len = sprintfW(ptr, setup_fmt, setup_file->FileName); + ptr += len + 1; } lstrcpyW(ptr, usage_fmt); @@ -5176,7 +5176,7 @@ static UINT ITERATE_InstallODBCTranslator( MSIRECORD *rec, LPVOID param ) return ERROR_FUNCTION_FAILED; } - len = lstrlenW(desc) + lstrlenW(translator_fmt) + lstrlenW(translator_file->FileName) + 1; + len = lstrlenW(desc) + lstrlenW(translator_fmt) + lstrlenW(translator_file->FileName) + 2; /* \0\0 */ if (setup_file) len += lstrlenW(setup_fmt) + lstrlenW(setup_file->FileName); @@ -5188,13 +5188,13 @@ static UINT ITERATE_InstallODBCTranslator( MSIRECORD *rec, LPVOID param ) lstrcpyW(ptr, desc); ptr += lstrlenW(ptr) + 1; - sprintfW(ptr, translator_fmt, translator_file->FileName); - ptr += lstrlenW(ptr) + 1; + len = sprintfW(ptr, translator_fmt, translator_file->FileName); + ptr += len + 1; if (setup_file) { - sprintfW(ptr, setup_fmt, setup_file->FileName); - ptr += lstrlenW(ptr) + 1; + len = sprintfW(ptr, setup_fmt, setup_file->FileName); + ptr += len + 1; } *ptr = '\0'; @@ -5234,7 +5234,7 @@ static UINT ITERATE_InstallODBCDataSource( MSIRECORD *rec, LPVOID param ) if (registration == msidbODBCDataSourceRegistrationPerMachine) request = ODBC_ADD_SYS_DSN; else if (registration == msidbODBCDataSourceRegistrationPerUser) request = ODBC_ADD_DSN; - len = lstrlenW(attrs_fmt) + lstrlenW(desc) + 1 + 1; + len = lstrlenW(attrs_fmt) + lstrlenW(desc) + 2; /* \0\0 */ attrs = msi_alloc(len * sizeof(WCHAR)); if (!attrs) return ERROR_OUTOFMEMORY; @@ -5348,7 +5348,7 @@ static UINT ITERATE_RemoveODBCDataSource( MSIRECORD *rec, LPVOID param ) if (registration == msidbODBCDataSourceRegistrationPerMachine) request = ODBC_REMOVE_SYS_DSN; else if (registration == msidbODBCDataSourceRegistrationPerUser) request = ODBC_REMOVE_DSN; - len = strlenW( attrs_fmt ) + strlenW( desc ) + 1 + 1; + len = strlenW( attrs_fmt ) + strlenW( desc ) + 2; /* \0\0 */ attrs = msi_alloc( len * sizeof(WCHAR) ); if (!attrs) return ERROR_OUTOFMEMORY;

1 0