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

Misha Koshelev : urlmon/tests: Add tests for calls to IHttpNegotiate interfaces as exposed by IBindStatusCallback .
by Alexandre Julliard July 24, 2007

July 24, 2007

Module: wine Branch: master Commit: 8f78c71cb6e7e2bc5bb318cf4cd37404f363d619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f78c71cb6e7e2bc5bb318cf4… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Jul 23 20:33:08 2007 -0500 urlmon/tests: Add tests for calls to IHttpNegotiate interfaces as exposed by IBindStatusCallback. Add more tests for specific arguments passed to IHttpNegotiate and IHttpNegotiate2. Note that for OnResponse pszAdditionalHeaders is NULL when called directly from IInternetProtocol (for example as seen in our protocol tests) but non-NULL when these interfaces are exposed by IBindStatusCallback as seen here. Tests conform on Win98 and Winxp. --- dlls/urlmon/tests/url.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 102 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 7aa6ead..187fb03 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -67,7 +67,10 @@ DEFINE_EXPECT(QueryInterface_IServiceProvider); DEFINE_EXPECT(QueryInterface_IHttpNegotiate); +DEFINE_EXPECT(BeginningTransaction); +DEFINE_EXPECT(OnResponse); DEFINE_EXPECT(QueryInterface_IHttpNegotiate2); +DEFINE_EXPECT(GetRootSecurityId); DEFINE_EXPECT(GetBindInfo); DEFINE_EXPECT(OnStartBinding); DEFINE_EXPECT(OnProgress_FINDINGRESOURCE); @@ -374,6 +377,92 @@ static const IInternetProtocolVtbl ProtocolVtbl = { static IInternetProtocol Protocol = { &ProtocolVtbl }; +static HRESULT WINAPI HttpNegotiate_QueryInterface(IHttpNegotiate2 *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IUnknown, riid) + || IsEqualGUID(&IID_IHttpNegotiate, riid) + || IsEqualGUID(&IID_IHttpNegotiate2, riid)) { + *ppv = iface; + return S_OK; + } + + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI HttpNegotiate_AddRef(IHttpNegotiate2 *iface) +{ + return 2; +} + +static ULONG WINAPI HttpNegotiate_Release(IHttpNegotiate2 *iface) +{ + return 1; +} + +static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate2 *iface, LPCWSTR szURL, + LPCWSTR szHeaders, DWORD dwReserved, LPWSTR *pszAdditionalHeaders) +{ + CHECK_EXPECT(BeginningTransaction); + + ok(!lstrcmpW(szURL, urls[test_protocol]), "szURL != urls[test_protocol]\n"); + ok(!dwReserved, "dwReserved=%d, expected 0\n", dwReserved); + ok(pszAdditionalHeaders != NULL, "pszAdditionalHeaders == NULL\n"); + if(pszAdditionalHeaders) + ok(*pszAdditionalHeaders == NULL, "*pszAdditionalHeaders != NULL\n"); + + return S_OK; +} + +static HRESULT WINAPI HttpNegotiate_OnResponse(IHttpNegotiate2 *iface, DWORD dwResponseCode, + LPCWSTR szResponseHeaders, LPCWSTR szRequestHeaders, LPWSTR *pszAdditionalRequestHeaders) +{ + CHECK_EXPECT(OnResponse); + + ok(dwResponseCode == 200, "dwResponseCode=%d, expected 200\n", dwResponseCode); + ok(szResponseHeaders != NULL, "szResponseHeaders == NULL\n"); + ok(szRequestHeaders == NULL, "szRequestHeaders != NULL\n"); + /* Note: in protocol.c tests, OnResponse pszAdditionalRequestHeaders _is_ NULL */ + ok(pszAdditionalRequestHeaders != NULL, "pszAdditionalHeaders == NULL\n"); + if(pszAdditionalRequestHeaders) + ok(*pszAdditionalRequestHeaders == NULL, "*pszAdditionalHeaders != NULL\n"); + + return S_OK; +} + +static HRESULT WINAPI HttpNegotiate_GetRootSecurityId(IHttpNegotiate2 *iface, + BYTE *pbSecurityId, DWORD *pcbSecurityId, DWORD_PTR dwReserved) +{ + static const BYTE sec_id[] = {'h','t','t','p',':','t','e','s','t',1,0,0,0}; + + CHECK_EXPECT(GetRootSecurityId); + + ok(!dwReserved, "dwReserved=%ld, expected 0\n", dwReserved); + ok(pbSecurityId != NULL, "pbSecurityId == NULL\n"); + ok(pcbSecurityId != NULL, "pcbSecurityId == NULL\n"); + + if(pcbSecurityId) { + ok(*pcbSecurityId == 512, "*pcbSecurityId=%d, expected 512\n", *pcbSecurityId); + *pcbSecurityId = sizeof(sec_id); + } + + if(pbSecurityId) + memcpy(pbSecurityId, sec_id, sizeof(sec_id)); + + return E_FAIL; +} + +static IHttpNegotiate2Vtbl HttpNegotiateVtbl = { + HttpNegotiate_QueryInterface, + HttpNegotiate_AddRef, + HttpNegotiate_Release, + HttpNegotiate_BeginningTransaction, + HttpNegotiate_OnResponse, + HttpNegotiate_GetRootSecurityId +}; + +static IHttpNegotiate2 HttpNegotiate = { &HttpNegotiateVtbl }; + static HRESULT WINAPI statusclb_QueryInterface(IBindStatusCallback *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IInternetProtocol, riid)) { @@ -391,10 +480,14 @@ static HRESULT WINAPI statusclb_QueryInterface(IBindStatusCallback *iface, REFII else if (IsEqualGUID(&IID_IHttpNegotiate, riid)) { CHECK_EXPECT(QueryInterface_IHttpNegotiate); + *ppv = &HttpNegotiate; + return S_OK; } else if (IsEqualGUID(&IID_IHttpNegotiate2, riid)) { CHECK_EXPECT(QueryInterface_IHttpNegotiate2); + *ppv = &HttpNegotiate; + return S_OK; } return E_NOINTERFACE; @@ -724,12 +817,16 @@ static void test_BindToStorage(int protocol, BOOL emul) }else { if(test_protocol == HTTP_TEST) { SET_EXPECT(QueryInterface_IHttpNegotiate); + SET_EXPECT(BeginningTransaction); SET_EXPECT(QueryInterface_IHttpNegotiate2); + SET_EXPECT(GetRootSecurityId); SET_EXPECT(OnProgress_FINDINGRESOURCE); SET_EXPECT(OnProgress_CONNECTING); } if(test_protocol == HTTP_TEST || test_protocol == FILE_TEST) SET_EXPECT(OnProgress_SENDINGREQUEST); + if(test_protocol == HTTP_TEST) + SET_EXPECT(OnResponse); SET_EXPECT(OnProgress_MIMETYPEAVAILABLE); SET_EXPECT(OnProgress_BEGINDOWNLOADDATA); if(test_protocol == HTTP_TEST) @@ -771,11 +868,15 @@ static void test_BindToStorage(int protocol, BOOL emul) }else { if(test_protocol == HTTP_TEST) { todo_wine CHECK_CALLED(QueryInterface_IHttpNegotiate); - /* QueryInterface_IHttpNegotiate2 called on WinXP but not on Win98 */ + todo_wine CHECK_CALLED(BeginningTransaction); + /* QueryInterface_IHttpNegotiate2 and GetRootSecurityId + * called on WinXP but not on Win98 */ CLEAR_CALLED(QueryInterface_IHttpNegotiate2); + CLEAR_CALLED(GetRootSecurityId); CHECK_CALLED(OnProgress_FINDINGRESOURCE); CHECK_CALLED(OnProgress_CONNECTING); CHECK_CALLED(OnProgress_SENDINGREQUEST); + todo_wine CHECK_CALLED(OnResponse); todo_wine { CHECK_CALLED(OnProgress_MIMETYPEAVAILABLE); } }else { todo_wine CHECK_NOT_CALLED(QueryInterface_IServiceProvider);

1 0

Misha Koshelev : urlmon: Add a reference to the IUnknown for Release of STGMEDIUM to account for extra call to ReleaseBindInfo .
by Alexandre Julliard July 24, 2007

July 24, 2007

Module: wine Branch: master Commit: 2b4c52014e40e0f34f3a1ece18206dbb7a4daa7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b4c52014e40e0f34f3a1ece1… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Jul 23 20:31:24 2007 -0500 urlmon: Add a reference to the IUnknown for Release of STGMEDIUM to account for extra call to ReleaseBindInfo. --- dlls/urlmon/binding.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 62cac80..17bc0f2 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -996,6 +996,9 @@ static HRESULT WINAPI InternetBindInfo_GetBindInfo(IInternetBindInfo *iface, if(pbindinfo->szExtraInfo || pbindinfo->szCustomVerb) FIXME("copy strings\n"); + if(pbindinfo->stgmedData.pUnkForRelease) + IUnknown_AddRef(pbindinfo->stgmedData.pUnkForRelease); + if(pbindinfo->pUnk) IUnknown_AddRef(pbindinfo->pUnk);

1 0

Misha Koshelev : urlmon: ReleaseBindInfo in FileProtocol.
by Alexandre Julliard July 24, 2007

July 24, 2007

Module: wine Branch: master Commit: 40b94b733bbcfb985b4a508f1a8f306fb491dda6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40b94b733bbcfb985b4a508f1… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Jul 23 20:30:57 2007 -0500 urlmon: ReleaseBindInfo in FileProtocol. --- dlls/urlmon/file.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index 0386a27..8d7b444 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -122,7 +122,13 @@ static HRESULT WINAPI FileProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl memset(&bindinfo, 0, sizeof(bindinfo)); bindinfo.cbSize = sizeof(BINDINFO); - IInternetBindInfo_GetBindInfo(pOIBindInfo, &grfBINDF, &bindinfo); + hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &grfBINDF, &bindinfo); + if(FAILED(hres)) { + WARN("GetBindInfo failed: %08x\n", hres); + return hres; + } + + ReleaseBindInfo(&bindinfo); if(lstrlenW(szUrl) < sizeof(wszFile)/sizeof(WCHAR) || memcmp(szUrl, wszFile, sizeof(wszFile)))

1 0

Misha Koshelev : urlmon/tests: Add tests for calls to IBindStatusCallback_QueryInterface.
by Alexandre Julliard July 24, 2007

July 24, 2007

Module: wine Branch: master Commit: 89bda109601ef9e4092bf71b0b5068295f6dcd7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=89bda109601ef9e4092bf71b0… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Jul 23 20:31:50 2007 -0500 urlmon/tests: Add tests for calls to IBindStatusCallback_QueryInterface. --- dlls/urlmon/tests/url.c | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 45 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 5213598..7aa6ead 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -56,6 +56,18 @@ expect_ ## func = called_ ## func = FALSE; \ }while(0) +#define CHECK_NOT_CALLED(func) \ + do { \ + ok(!called_ ## func, "unexpected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +#define CLEAR_CALLED(func) \ + expect_ ## func = called_ ## func = FALSE + +DEFINE_EXPECT(QueryInterface_IServiceProvider); +DEFINE_EXPECT(QueryInterface_IHttpNegotiate); +DEFINE_EXPECT(QueryInterface_IHttpNegotiate2); DEFINE_EXPECT(GetBindInfo); DEFINE_EXPECT(OnStartBinding); DEFINE_EXPECT(OnProgress_FINDINGRESOURCE); @@ -372,6 +384,18 @@ static HRESULT WINAPI statusclb_QueryInterface(IBindStatusCallback *iface, REFII return E_NOINTERFACE; } } + else if (IsEqualGUID(&IID_IServiceProvider, riid)) + { + CHECK_EXPECT(QueryInterface_IServiceProvider); + } + else if (IsEqualGUID(&IID_IHttpNegotiate, riid)) + { + CHECK_EXPECT(QueryInterface_IHttpNegotiate); + } + else if (IsEqualGUID(&IID_IHttpNegotiate2, riid)) + { + CHECK_EXPECT(QueryInterface_IHttpNegotiate2); + } return E_NOINTERFACE; } @@ -561,8 +585,10 @@ static void test_CreateAsyncBindCtx(void) hres = CreateAsyncBindCtx(0, NULL, NULL, NULL); ok(hres == E_INVALIDARG, "CreateAsyncBindCtx failed. expected: E_INVALIDARG, got: %08x\n", hres); + SET_EXPECT(QueryInterface_IServiceProvider); hres = CreateAsyncBindCtx(0, &bsc, NULL, &bctx); ok(SUCCEEDED(hres), "CreateAsyncBindCtx failed: %08x\n", hres); + todo_wine CHECK_CALLED(QueryInterface_IServiceProvider); bindopts.cbStruct = sizeof(bindopts); hres = IBindCtx_GetBindOptions(bctx, &bindopts); @@ -627,8 +653,10 @@ static void test_CreateAsyncBindCtxEx(void) IBindCtx_Release(bctx_arg); + SET_EXPECT(QueryInterface_IServiceProvider); hres = CreateAsyncBindCtxEx(NULL, 0, &bsc, NULL, &bctx, 0); ok(hres == S_OK, "CreateAsyncBindCtxEx failed: %08x\n", hres); + todo_wine CHECK_CALLED(QueryInterface_IServiceProvider); if(SUCCEEDED(hres)) IBindCtx_Release(bctx); @@ -648,14 +676,23 @@ static void test_BindToStorage(int protocol, BOOL emul) test_protocol = protocol; emulate_protocol = emul; + SET_EXPECT(QueryInterface_IServiceProvider); hres = CreateAsyncBindCtx(0, &bsc, NULL, &bctx); ok(SUCCEEDED(hres), "CreateAsyncBindCtx failed: %08x\n\n", hres); if(FAILED(hres)) return; - + if(test_protocol == HTTP_TEST || + test_protocol == ABOUT_TEST || + (emul && test_protocol == FILE_TEST)) todo_wine + CHECK_CALLED(QueryInterface_IServiceProvider); + else + CHECK_CALLED(QueryInterface_IServiceProvider); + + SET_EXPECT(QueryInterface_IServiceProvider); hres = RegisterBindStatusCallback(bctx, &bsc, &previousclb, 0); ok(SUCCEEDED(hres), "RegisterBindStatusCallback failed: %08x\n", hres); ok(previousclb == &bsc, "previousclb(%p) != sclb(%p)\n", previousclb, &bsc); + todo_wine CHECK_CALLED(QueryInterface_IServiceProvider); if(previousclb) IBindStatusCallback_Release(previousclb); @@ -678,6 +715,7 @@ static void test_BindToStorage(int protocol, BOOL emul) ok(hres == S_OK, "GetDisplayName failed %08x\n", hres); ok(!lstrcmpW(display_name, urls[test_protocol]), "GetDisplayName got wrong name\n"); + SET_EXPECT(QueryInterface_IServiceProvider); SET_EXPECT(GetBindInfo); SET_EXPECT(OnStartBinding); if(emulate_protocol) { @@ -685,6 +723,8 @@ static void test_BindToStorage(int protocol, BOOL emul) SET_EXPECT(UnlockRequest); }else { if(test_protocol == HTTP_TEST) { + SET_EXPECT(QueryInterface_IHttpNegotiate); + SET_EXPECT(QueryInterface_IHttpNegotiate2); SET_EXPECT(OnProgress_FINDINGRESOURCE); SET_EXPECT(OnProgress_CONNECTING); } @@ -730,11 +770,15 @@ static void test_BindToStorage(int protocol, BOOL emul) CHECK_CALLED(UnlockRequest); }else { if(test_protocol == HTTP_TEST) { + todo_wine CHECK_CALLED(QueryInterface_IHttpNegotiate); + /* QueryInterface_IHttpNegotiate2 called on WinXP but not on Win98 */ + CLEAR_CALLED(QueryInterface_IHttpNegotiate2); CHECK_CALLED(OnProgress_FINDINGRESOURCE); CHECK_CALLED(OnProgress_CONNECTING); CHECK_CALLED(OnProgress_SENDINGREQUEST); todo_wine { CHECK_CALLED(OnProgress_MIMETYPEAVAILABLE); } }else { + todo_wine CHECK_NOT_CALLED(QueryInterface_IServiceProvider); CHECK_CALLED(OnProgress_MIMETYPEAVAILABLE); } CHECK_CALLED(OnProgress_BEGINDOWNLOADDATA);

1 0

Misha Koshelev : urlmon: Don' t ignore bytes read from IInternetProtocol_Read if hres is not S_OK (e.g., E_PENDING).
by Alexandre Julliard July 24, 2007

July 24, 2007

Module: wine Branch: master Commit: 03ac3b5e95f68395ebc49fda5457a0e7941d40eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=03ac3b5e95f68395ebc49fda5… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Jul 23 20:30:17 2007 -0500 urlmon: Don't ignore bytes read from IInternetProtocol_Read if hres is not S_OK (e.g., E_PENDING). Bytes can still be read with E_PENDING returned if the whole request could not be satisfied, don't ignore those. --- dlls/urlmon/binding.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index cd82eb9..62cac80 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -146,10 +146,9 @@ static void fill_stream_buffer(ProtocolStream *This) This->hres = IInternetProtocol_Read(This->protocol, This->buf+This->buf_size, sizeof(This->buf)-This->buf_size, &read); - if(SUCCEEDED(This->hres)) { - This->buf_size += read; + This->buf_size += read; + if(read > 0) This->init_buf = TRUE; - } } static LRESULT WINAPI notif_wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

1 0

Misha Koshelev : urlmon: Fix timing issue with FLAG_REQUEST_COMPLETE and InternetQueryDataAvailable in HttpProtocol .
by Alexandre Julliard July 24, 2007

July 24, 2007

Module: wine Branch: master Commit: 9bcb9c16ec8394f3dbae1a553378bb935bf46e20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bcb9c16ec8394f3dbae1a553… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Jul 23 20:29:55 2007 -0500 urlmon: Fix timing issue with FLAG_REQUEST_COMPLETE and InternetQueryDataAvailable in HttpProtocol. --- dlls/urlmon/http.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 2afe267..a720651 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -725,11 +725,14 @@ static HRESULT WINAPI HttpProtocol_Read(IInternetProtocol *iface, void *pv, { if (This->available_bytes == 0) { + /* InternetQueryDataAvailable may immediately fork and perform its asynchronous + * read, so clear the flag _before_ calling so it does not incorrectly get cleared + * after the status callback is called */ + This->flags &= ~FLAG_REQUEST_COMPLETE; if (!InternetQueryDataAvailable(This->request, &This->available_bytes, 0, 0)) { if (GetLastError() == ERROR_IO_PENDING) { - This->flags &= ~FLAG_REQUEST_COMPLETE; hres = E_PENDING; } else @@ -778,6 +781,9 @@ done: if (pcbRead) *pcbRead = read; + if (hres != E_PENDING) + This->flags |= FLAG_REQUEST_COMPLETE; + return hres; }

1 0

Damjan Jovanovic : ws2_32: Sending 0 bytes shouldn't cause an infinite loop .
by Alexandre Julliard July 24, 2007

July 24, 2007

Module: wine Branch: master Commit: 827644ad718856ec8e940cd4d5a0fa692f5ab37c URL: http://source.winehq.org/git/wine.git/?a=commit;h=827644ad718856ec8e940cd4d… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Jul 24 07:44:57 2007 +0200 ws2_32: Sending 0 bytes shouldn't cause an infinite loop. --- dlls/ws2_32/socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0a6597d..5a27fce 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2714,7 +2714,7 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, struct pollfd pfd; int timeout = GET_SNDTIMEO(fd); - if (n > 0) + if (n >= 0) { *lpNumberOfBytesSent += n; while (first_buff < dwBufferCount && iovec[first_buff].iov_len <= n)

1 0

James Hawkins : msi: Add handling for the MSIMODIFY_UPDATE command.
by Alexandre Julliard July 24, 2007

July 24, 2007

Module: wine Branch: master Commit: f4147ca004022228257d3ee89ff1540eb90a0b60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4147ca004022228257d3ee89… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 23 19:20:51 2007 -0700 msi: Add handling for the MSIMODIFY_UPDATE command. --- dlls/msi/table.c | 28 +++++++++++++++++++++++++++- dlls/msi/tests/db.c | 25 +++++-------------------- 2 files changed, 32 insertions(+), 21 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 745712a..5333817 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1532,6 +1532,29 @@ static UINT TABLE_delete_row( struct tagMSIVIEW *view, UINT row ) return ERROR_SUCCESS; } +static UINT msi_table_update(struct tagMSIVIEW *view, MSIRECORD *rec) +{ + MSITABLEVIEW *tv = (MSITABLEVIEW *)view; + UINT r, row; + + /* FIXME: MsiViewFetch should set rec index 0 to some ID that + * sets the fetched record apart from other records + */ + + if (!tv->table) + return ERROR_INVALID_PARAMETER; + + r = msi_table_find_row(tv, rec, &row); + if (r != ERROR_SUCCESS) + return ERROR_SUCCESS; + + /* the row cannot be changed */ + if (row != 0) + return ERROR_FUNCTION_FAILED; + + return TABLE_set_row(view, row, rec, (1 << tv->num_cols) - 1); +} + static UINT TABLE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIRECORD *rec) { @@ -1553,9 +1576,12 @@ static UINT TABLE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, r = TABLE_insert_row( view, rec, TRUE ); break; + case MSIMODIFY_UPDATE: + r = msi_table_update( view, rec ); + break; + case MSIMODIFY_REFRESH: case MSIMODIFY_INSERT: - case MSIMODIFY_UPDATE: case MSIMODIFY_ASSIGN: case MSIMODIFY_REPLACE: case MSIMODIFY_MERGE: diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 1cb8ce6..5b01189 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -832,17 +832,11 @@ static void test_viewmodify(void) ok(r == ERROR_SUCCESS, "MsiRecordSetString failed\n"); r = MsiViewModify(hview, MSIMODIFY_UPDATE, hrec); - todo_wine - { - ok(r == ERROR_SUCCESS, "MsiViewModify failed\n"); - } + ok(r == ERROR_SUCCESS, "MsiViewModify failed\n"); /* do it again */ r = MsiViewModify(hview, MSIMODIFY_UPDATE, hrec); - todo_wine - { - ok(r == ERROR_SUCCESS, "MsiViewModify failed: %d\n", r); - } + ok(r == ERROR_SUCCESS, "MsiViewModify failed: %d\n", r); /* update the view, primary key */ r = MsiRecordSetInteger(hrec, 1, 5); @@ -883,10 +877,7 @@ static void test_viewmodify(void) sz = sizeof(buffer); r = MsiRecordGetString(hrec, 3, buffer, &sz); ok(r == ERROR_SUCCESS, "MsiRecordGetString failed\n"); - todo_wine - { - ok(!lstrcmp(buffer, "3141592"), "Expected 3141592, got %s\n", buffer); - } + ok(!lstrcmp(buffer, "3141592"), "Expected 3141592, got %s\n", buffer); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n"); @@ -965,10 +956,7 @@ static void test_viewmodify(void) ok(r == ERROR_SUCCESS, "failed to set string\n"); r = MsiViewModify(hview, MSIMODIFY_UPDATE, hrec); - todo_wine - { - ok(r == ERROR_FUNCTION_FAILED, "MsiViewModify failed\n"); - } + ok(r == ERROR_FUNCTION_FAILED, "MsiViewModify failed\n"); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n"); @@ -993,10 +981,7 @@ static void test_viewmodify(void) ok(r == ERROR_SUCCESS, "failed to set string\n"); r = MsiViewModify(hview, MSIMODIFY_UPDATE, hrec); - todo_wine - { - ok(r == ERROR_FUNCTION_FAILED, "MsiViewModify failed\n"); - } + ok(r == ERROR_FUNCTION_FAILED, "MsiViewModify failed\n"); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n");

1 0

James Hawkins : msi: Add tests for the MSIMODIFY_UPDATE command.
by Alexandre Julliard July 24, 2007

July 24, 2007

Module: wine Branch: master Commit: 479aca473160842abe99a5e6717a0f3aaabb6dce URL: http://source.winehq.org/git/wine.git/?a=commit;h=479aca473160842abe99a5e67… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 23 19:19:58 2007 -0700 msi: Add tests for the MSIMODIFY_UPDATE command. --- dlls/msi/tests/db.c | 207 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 204 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 58c3f22..1cb8ce6 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -774,12 +774,12 @@ static void test_viewmodify(void) /* insert a valid record */ hrec = MsiCreateRecord(3); - r = MsiRecordSetInteger(hrec, 2, 1); + r = MsiRecordSetInteger(hrec, 1, 1); ok(r == ERROR_SUCCESS, "failed to set integer\n"); r = MsiRecordSetString(hrec, 2, "bob"); - ok(r == ERROR_SUCCESS, "failed to set integer\n"); + ok(r == ERROR_SUCCESS, "failed to set string\n"); r = MsiRecordSetString(hrec, 3, "7654321"); - ok(r == ERROR_SUCCESS, "failed to set integer\n"); + ok(r == ERROR_SUCCESS, "failed to set string\n"); r = MsiViewExecute(hview, 0); ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); @@ -804,6 +804,207 @@ static void test_viewmodify(void) r = MsiCloseHandle(hview); ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + query = "SELECT * FROM `phone`"; + 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); + + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 2, buffer, &sz); + ok(r == ERROR_SUCCESS, "MsiRecordGetString failed\n"); + ok(!lstrcmp(buffer, "bob"), "Expected bob, got %s\n", buffer); + + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 3, buffer, &sz); + ok(r == ERROR_SUCCESS, "MsiRecordGetString failed\n"); + ok(!lstrcmp(buffer, "7654321"), "Expected 7654321, got %s\n", buffer); + + /* update the view, non-primary key */ + r = MsiRecordSetString(hrec, 3, "3141592"); + ok(r == ERROR_SUCCESS, "MsiRecordSetString failed\n"); + + r = MsiViewModify(hview, MSIMODIFY_UPDATE, hrec); + todo_wine + { + ok(r == ERROR_SUCCESS, "MsiViewModify failed\n"); + } + + /* do it again */ + r = MsiViewModify(hview, MSIMODIFY_UPDATE, hrec); + todo_wine + { + ok(r == ERROR_SUCCESS, "MsiViewModify failed: %d\n", r); + } + + /* update the view, primary key */ + r = MsiRecordSetInteger(hrec, 1, 5); + ok(r == ERROR_SUCCESS, "MsiRecordSetInteger failed\n"); + + r = MsiViewModify(hview, MSIMODIFY_UPDATE, hrec); + todo_wine + { + ok(r == ERROR_FUNCTION_FAILED, "MsiViewModify failed\n"); + } + + 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 `phone`"; + 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); + + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 2, buffer, &sz); + ok(r == ERROR_SUCCESS, "MsiRecordGetString failed\n"); + ok(!lstrcmp(buffer, "bob"), "Expected bob, got %s\n", buffer); + + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 3, buffer, &sz); + ok(r == ERROR_SUCCESS, "MsiRecordGetString failed\n"); + todo_wine + { + ok(!lstrcmp(buffer, "3141592"), "Expected 3141592, got %s\n", buffer); + } + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + /* use a record that doesn't come from a view fetch */ + hrec = MsiCreateRecord(3); + ok(hrec != 0, "MsiCreateRecord failed\n"); + + r = MsiRecordSetInteger(hrec, 1, 3); + ok(r == ERROR_SUCCESS, "failed to set integer\n"); + r = MsiRecordSetString(hrec, 2, "jane"); + ok(r == ERROR_SUCCESS, "failed to set string\n"); + r = MsiRecordSetString(hrec, 3, "112358"); + ok(r == ERROR_SUCCESS, "failed to set string\n"); + + r = MsiViewModify(hview, MSIMODIFY_UPDATE, hrec); + todo_wine + { + ok(r == ERROR_FUNCTION_FAILED, "Expected ERROR_FUNCTION_FAILED, got %d\n", r); + } + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + /* use a record that doesn't come from a view fetch, primary key matches */ + hrec = MsiCreateRecord(3); + ok(hrec != 0, "MsiCreateRecord failed\n"); + + r = MsiRecordSetInteger(hrec, 1, 1); + ok(r == ERROR_SUCCESS, "failed to set integer\n"); + r = MsiRecordSetString(hrec, 2, "jane"); + ok(r == ERROR_SUCCESS, "failed to set string\n"); + r = MsiRecordSetString(hrec, 3, "112358"); + ok(r == ERROR_SUCCESS, "failed to set string\n"); + + r = MsiViewModify(hview, MSIMODIFY_UPDATE, hrec); + todo_wine + { + ok(r == ERROR_FUNCTION_FAILED, "MsiViewModify failed\n"); + } + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + hrec = MsiCreateRecord(3); + + r = MsiRecordSetInteger(hrec, 1, 2); + ok(r == ERROR_SUCCESS, "failed to set integer\n"); + r = MsiRecordSetString(hrec, 2, "nick"); + ok(r == ERROR_SUCCESS, "failed to set string\n"); + r = MsiRecordSetString(hrec, 3, "141421"); + ok(r == ERROR_SUCCESS, "failed to set string\n"); + + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + r = MsiViewModify(hview, MSIMODIFY_INSERT_TEMPORARY, hrec ); + ok(r == ERROR_SUCCESS, "MsiViewModify failed\n"); + + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + query = "SELECT * FROM `phone` WHERE `id` = 1"; + 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"); + + /* change the id to match the second row */ + r = MsiRecordSetInteger(hrec, 1, 2); + ok(r == ERROR_SUCCESS, "failed to set integer\n"); + r = MsiRecordSetString(hrec, 2, "jerry"); + ok(r == ERROR_SUCCESS, "failed to set string\n"); + + r = MsiViewModify(hview, MSIMODIFY_UPDATE, hrec); + todo_wine + { + ok(r == ERROR_FUNCTION_FAILED, "MsiViewModify failed\n"); + } + + 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"); + + /* broader search */ + query = "SELECT * FROM `phone` ORDER BY `id`"; + 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"); + + /* change the id to match the second row */ + r = MsiRecordSetInteger(hrec, 1, 2); + ok(r == ERROR_SUCCESS, "failed to set integer\n"); + r = MsiRecordSetString(hrec, 2, "jerry"); + ok(r == ERROR_SUCCESS, "failed to set string\n"); + + r = MsiViewModify(hview, MSIMODIFY_UPDATE, hrec); + todo_wine + { + ok(r == ERROR_FUNCTION_FAILED, "MsiViewModify failed\n"); + } + + 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"); + r = MsiCloseHandle( hdb ); ok(r == ERROR_SUCCESS, "MsiOpenDatabase close failed\n"); }

1 0

James Hawkins : msi: Properly delete the columns view.
by Alexandre Julliard July 24, 2007

July 24, 2007

Module: wine Branch: master Commit: 8a7690c1519189d49d7fc4c6d4a2bd01462fddaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a7690c1519189d49d7fc4c6d… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 23 19:19:15 2007 -0700 msi: Properly delete the columns view. --- dlls/msi/alter.c | 2 +- dlls/msi/table.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/alter.c b/dlls/msi/alter.c index 734aaba..cfb8ab4 100644 --- a/dlls/msi/alter.c +++ b/dlls/msi/alter.c @@ -129,7 +129,7 @@ static UINT alter_add_column(MSIALTERVIEW *av) colnum, av->colinfo->column, av->colinfo->type, (av->hold == 1)); - msiobj_release(&columns->hdr); + columns->ops->delete(columns); return r; } diff --git a/dlls/msi/table.c b/dlls/msi/table.c index b65494a..745712a 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1686,7 +1686,7 @@ static UINT TABLE_add_ref(struct tagMSIVIEW *view) static UINT TABLE_remove_column(struct tagMSIVIEW *view, LPCWSTR table, UINT number) { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; - MSIRECORD *rec; + MSIRECORD *rec = NULL; MSIVIEW *columns = NULL; UINT row, r; @@ -1713,7 +1713,7 @@ static UINT TABLE_remove_column(struct tagMSIVIEW *view, LPCWSTR table, UINT num done: msiobj_release(&rec->hdr); - if (columns) msiobj_release(&columns->hdr); + if (columns) columns->ops->delete(columns); return r; }

1 0