wine-commits August 2013

wine-commits@winehq.org

2 participants
461 discussions

Piotr Caban : scrrun: Fix IFileSystem3::GetAbsolutePathName tests failures.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: ec7ebd358d2683baeb7c2bc2b8d51be87964ea18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec7ebd358d2683baeb7c2bc2b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 1 11:46:50 2013 +0200 scrrun: Fix IFileSystem3::GetAbsolutePathName tests failures. --- dlls/scrrun/tests/filesystem.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index a3ad79f..e231f9a 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -401,7 +401,7 @@ static void test_GetAbsolutePathName(void) WIN32_FIND_DATAW fdata; HANDLE find; - WCHAR buf[MAX_PATH]; + WCHAR buf[MAX_PATH], buf2[MAX_PATH]; BSTR path, result; HRESULT hr; @@ -424,22 +424,23 @@ static void test_GetAbsolutePathName(void) path = SysAllocString(dir_match1); hr = IFileSystem3_GetAbsolutePathName(fs3, path, &result); ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); - GetFullPathNameW(dir_match1, MAX_PATH, buf, NULL); - ok(!lstrcmpW(buf, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); + GetFullPathNameW(dir_match1, MAX_PATH, buf2, NULL); + ok(!lstrcmpW(buf2, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf2)); SysFreeString(result); ok(CreateDirectoryW(dir1, NULL), "CreateDirectory(%s) failed\n", wine_dbgstr_w(dir1)); hr = IFileSystem3_GetAbsolutePathName(fs3, path, &result); ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); GetFullPathNameW(dir1, MAX_PATH, buf, NULL); - ok(!lstrcmpW(buf, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); + ok(!lstrcmpW(buf, result) || broken(!lstrcmpW(buf2, result)), "result = %s, expected %s\n", + wine_dbgstr_w(result), wine_dbgstr_w(buf)); SysFreeString(result); ok(CreateDirectoryW(dir2, NULL), "CreateDirectory(%s) failed\n", wine_dbgstr_w(dir2)); hr = IFileSystem3_GetAbsolutePathName(fs3, path, &result); ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); - if(!lstrcmpW(buf, result)) { - ok(!lstrcmpW(buf, result), "result = %s, expected %s\n", + if(!lstrcmpW(buf, result) || !lstrcmpW(buf2, result)) { + ok(!lstrcmpW(buf, result) || broken(!lstrcmpW(buf2, result)), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); }else { GetFullPathNameW(dir2, MAX_PATH, buf, NULL);

1 0

Piotr Caban : scrrun: Fix IFile::get_Attributes tests and implementation.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: 12d3741200a658cbe2076f4d0efeb56133f666a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12d3741200a658cbe2076f4d0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 1 11:46:34 2013 +0200 scrrun: Fix IFile::get_Attributes tests and implementation. --- dlls/scrrun/filesystem.c | 4 +++- dlls/scrrun/tests/filesystem.c | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 19e3e23..19f5f2b 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -791,7 +791,9 @@ static HRESULT WINAPI file_get_Attributes(IFile *iface, FileAttribute *pfa) if(fa == INVALID_FILE_ATTRIBUTES) return create_error(GetLastError()); - *pfa = fa & ~FILE_ATTRIBUTE_NORMAL; + *pfa = fa & (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | + FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_ARCHIVE | + FILE_ATTRIBUTE_REPARSE_POINT | FILE_ATTRIBUTE_COMPRESSED); return S_OK; } diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 0ddbbac..a3ad79f 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -478,9 +478,7 @@ static void test_GetFile(void) hr = IFileSystem3_GetFile(fs3, NULL, &file); ok(hr == E_INVALIDARG, "GetFile returned %x, expected E_INVALIDARG\n", hr); - hf = CreateFileW(path, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if(hf != INVALID_HANDLE_VALUE) { - CloseHandle(hf); + if(GetFileAttributesW(path) != INVALID_FILE_ATTRIBUTES) { skip("File already exists, skipping GetFile tests\n"); SysFreeString(path); return; @@ -503,7 +501,9 @@ static void test_GetFile(void) ok(hr == S_OK, "GetFile returned %x, expected S_OK\n", hr); hr = IFile_get_Attributes(file, &fa); - gfa = GetFileAttributesW(get_file) & ~FILE_ATTRIBUTE_NORMAL; + gfa = GetFileAttributesW(get_file) & (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | + FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_ARCHIVE | + FILE_ATTRIBUTE_REPARSE_POINT | FILE_ATTRIBUTE_COMPRESSED); ok(hr == S_OK, "get_Attributes returned %x, expected S_OK\n", hr); ok(fa == gfa, "fa = %x, expected %x\n", fa, gfa);

1 0

Qian Hong : imm32: Fixed ImmUnlockIMCC.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: 00289d5b91d7c5f63643a4d21996989f68678ef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00289d5b91d7c5f63643a4d21… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Aug 1 14:32:54 2013 +0800 imm32: Fixed ImmUnlockIMCC. --- dlls/imm32/imm.c | 3 ++- dlls/imm32/tests/imm32.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 284d49e..5aee6ea 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2665,7 +2665,8 @@ BOOL WINAPI ImmUnlockIMCC(HIMCC imcc) IMCCInternal *internal; internal = imcc; - internal->dwLock --; + if (internal->dwLock) + internal->dwLock --; return (internal->dwLock!=0); } diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 9d41cc7..26101a4 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -728,9 +728,9 @@ static void test_ImmGetIMCCLockCount(void) count = ImmGetIMCCLockCount(imcc); ok(count == 0, "expect 0, returned %d\n", count); ret = ImmUnlockIMCC(imcc); - todo_wine ok(ret == FALSE, "expect FALSE, ret %d\n", ret); + ok(ret == FALSE, "expect FALSE, ret %d\n", ret); count = ImmGetIMCCLockCount(imcc); - todo_wine ok(count == 0, "expect 0, returned %d\n", count); + ok(count == 0, "expect 0, returned %d\n", count); ImmDestroyIMCC(imcc); }

1 0

Qian Hong : imm32/tests: Added test for IMCC lock count.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: 221438165774a2983678d0fd93cce1e49b3ef196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=221438165774a2983678d0fd9… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Aug 1 14:32:45 2013 +0800 imm32/tests: Added test for IMCC lock count. --- dlls/imm32/tests/imm32.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 0d4cb5c..9d41cc7 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -712,6 +712,28 @@ static void test_ImmGetIMCLockCount(void) ImmDestroyContext(imc); } +static void test_ImmGetIMCCLockCount(void) +{ + HIMCC imcc; + DWORD count, ret; + + imcc = ImmCreateIMCC(sizeof(CANDIDATEINFO)); + count = ImmGetIMCCLockCount(imcc); + ok(count == 0, "expect 0, returned %d\n", count); + ImmLockIMCC(imcc); + count = ImmGetIMCCLockCount(imcc); + ok(count == 1, "expect 1, returned %d\n", count); + ret = ImmUnlockIMCC(imcc); + ok(ret == FALSE, "expect FALSE, ret %d\n", ret); + count = ImmGetIMCCLockCount(imcc); + ok(count == 0, "expect 0, returned %d\n", count); + ret = ImmUnlockIMCC(imcc); + todo_wine ok(ret == FALSE, "expect FALSE, ret %d\n", ret); + count = ImmGetIMCCLockCount(imcc); + todo_wine ok(count == 0, "expect 0, returned %d\n", count); + ImmDestroyIMCC(imcc); +} + static void test_ImmMessages(void) { CANDIDATEFORM cf; @@ -872,6 +894,7 @@ START_TEST(imm32) { test_ImmGetDescription(); test_ImmDefaultHwnd(); test_ImmGetIMCLockCount(); + test_ImmGetIMCCLockCount(); msg_spy_cleanup(); /* Reinitialize the hooks to capture all windows */ msg_spy_init(NULL);

1 0

Qian Hong : imm32: Fixed ImmUnlockIMC.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: 44f60067381245ed11162d8796db0dbd96f8ec3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=44f60067381245ed11162d879… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Aug 1 14:32:35 2013 +0800 imm32: Fixed ImmUnlockIMC. --- dlls/imm32/imm.c | 5 +++-- dlls/imm32/tests/imm32.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 62f4b71..284d49e 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2606,8 +2606,9 @@ LPINPUTCONTEXT WINAPI ImmLockIMC(HIMC hIMC) BOOL WINAPI ImmUnlockIMC(HIMC hIMC) { InputContextData *data = hIMC; - data->dwLock--; - return (data->dwLock!=0); + if (data->dwLock) + data->dwLock--; + return TRUE; } /*********************************************************************** diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 7313854..0d4cb5c 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -702,13 +702,13 @@ static void test_ImmGetIMCLockCount(void) count = ImmGetIMCLockCount(imc); ok(count == 1, "expect 1, returned %d\n", count); ret = ImmUnlockIMC(imc); - todo_wine ok(ret == TRUE, "expect TRUE, ret %d\n", ret); + ok(ret == TRUE, "expect TRUE, ret %d\n", ret); count = ImmGetIMCLockCount(imc); ok(count == 0, "expect 0, returned %d\n", count); ret = ImmUnlockIMC(imc); ok(ret == TRUE, "expect TRUE, ret %d\n", ret); count = ImmGetIMCLockCount(imc); - todo_wine ok(count == 0, "expect 0, returned %d\n", count); + ok(count == 0, "expect 0, returned %d\n", count); ImmDestroyContext(imc); }

1 0

Qian Hong : imm32/tests: Added test for IMC lock count.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: 0f14a77f5da795cc240716486a16bc92462d7274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f14a77f5da795cc240716486… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Aug 1 14:32:24 2013 +0800 imm32/tests: Added test for IMC lock count. --- dlls/imm32/tests/imm32.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 8e6dab8..7313854 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -24,6 +24,7 @@ #include "winuser.h" #include "wingdi.h" #include "imm.h" +#include "ddk/imm.h" #define NUMELEMS(array) (sizeof((array))/sizeof((array)[0])) @@ -687,6 +688,30 @@ static void test_ImmDefaultHwnd(void) DestroyWindow(hwnd); } +static void test_ImmGetIMCLockCount(void) +{ + HIMC imc; + DWORD count, ret; + INPUTCONTEXT *ic; + + imc = ImmCreateContext(); + count = ImmGetIMCLockCount(imc); + ok(count == 0, "expect 0, returned %d\n", count); + ic = ImmLockIMC(imc); + ok(ic != NULL, "ImmLockIMC failed\n!"); + count = ImmGetIMCLockCount(imc); + ok(count == 1, "expect 1, returned %d\n", count); + ret = ImmUnlockIMC(imc); + todo_wine ok(ret == TRUE, "expect TRUE, ret %d\n", ret); + count = ImmGetIMCLockCount(imc); + ok(count == 0, "expect 0, returned %d\n", count); + ret = ImmUnlockIMC(imc); + ok(ret == TRUE, "expect TRUE, ret %d\n", ret); + count = ImmGetIMCLockCount(imc); + todo_wine ok(count == 0, "expect 0, returned %d\n", count); + ImmDestroyContext(imc); +} + static void test_ImmMessages(void) { CANDIDATEFORM cf; @@ -846,6 +871,7 @@ START_TEST(imm32) { test_ImmGetContext(); test_ImmGetDescription(); test_ImmDefaultHwnd(); + test_ImmGetIMCLockCount(); msg_spy_cleanup(); /* Reinitialize the hooks to capture all windows */ msg_spy_init(NULL);

1 0

Marcus Meissner : urlmon: Fixed a chars vs bytes mismatch.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: e89c801b502b2c2c53deb434d311ef8c1fafd928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e89c801b502b2c2c53deb434d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Aug 1 07:41:04 2013 +0200 urlmon: Fixed a chars vs bytes mismatch. --- dlls/urlmon/tests/misc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index cf5c943..aa5e365 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -83,7 +83,7 @@ static HRESULT (WINAPI *pIEInstallScope)(DWORD*); static int strcmp_wa(const WCHAR *strw, const char *stra) { WCHAR buf[512]; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)); + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(WCHAR)); return lstrcmpW(strw, buf); }

1 0

Marcus Meissner : mshtml: Fixed character vs byte mismatches.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: c803d53b130b182bf42029b20aebb698d9c18643 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c803d53b130b182bf42029b20… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Aug 1 07:37:09 2013 +0200 mshtml: Fixed character vs byte mismatches. --- dlls/mshtml/tests/protocol.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 04c4714..b4a6fc7 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -281,7 +281,7 @@ static void test_res_url(const char *url_suffix) HRESULT hres; memcpy(url, res_url_base, res_url_base_len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, url_suffix, -1, url+res_url_base_len, sizeof(url)-res_url_base_len); + MultiByteToWideChar(CP_ACP, 0, url_suffix, -1, url+res_url_base_len, sizeof(url)/sizeof(WCHAR)-res_url_base_len); hres = CoCreateInstance(&CLSID_ResProtocol, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void**)&protocol); ok(hres == S_OK, "Could not create ResProtocol instance: %08x\n", hres); @@ -943,7 +943,7 @@ static void test_javascript_protocol(void) START_TEST(protocol) { - res_url_base_len = 6 + GetModuleFileNameW(NULL, res_url_base + 6 /* strlen("res://") */, sizeof(res_url_base)-6); + res_url_base_len = 6 + GetModuleFileNameW(NULL, res_url_base + 6 /* strlen("res://") */, sizeof(res_url_base)/sizeof(WCHAR)-6); OleInitialize(NULL);

1 0

Nikolay Sivov : oledb32: Added IRowPositionChange interface definition.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: 2a78e48e201dfcf05e2385ebeaf5d329ff3c55e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a78e48e201dfcf05e2385ebe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 1 07:57:55 2013 +0400 oledb32: Added IRowPositionChange interface definition. --- dlls/msdaps/usrmarshal.c | 14 ++++++++++++++ include/Makefile.in | 1 + include/oledb.idl | 1 + include/rowpsc.idl | 36 ++++++++++++++++++++++++++++++++++++ tools/make_makefiles | 1 + 5 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index bff07ef..e5be7b6 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1477,3 +1477,17 @@ HRESULT CALLBACK IRowPosition_SetRowPosition_Proxy(IRowPosition* This, HCHAPTER FIXME("(%p)->(%lx %lx %d): stub\n", This, chapter, row, flags); return E_NOTIMPL; } + +HRESULT __RPC_STUB IRowPositionChange_OnRowPositionChange_Stub(IRowPositionChange* This, DBREASON reason, DBEVENTPHASE phase, + BOOL cant_deny, IErrorInfo **errorinfo) +{ + FIXME("(%p)->(0x%x 0x%x %d %p): stub\n", This, reason, phase, cant_deny, errorinfo); + return E_NOTIMPL; +} + +HRESULT CALLBACK IRowPositionChange_OnRowPositionChange_Proxy(IRowPositionChange* This, DBREASON reason, DBEVENTPHASE phase, + BOOL cant_deny) +{ + FIXME("(%p)->(0x%x 0x%x %d): stub\n", This, reason, phase, cant_deny); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index 0818999..7f26dca 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -481,6 +481,7 @@ SRCDIR_INCLUDES = \ row.idl \ rowchg.idl \ rowpos.idl \ + rowpsc.idl \ rpc.h \ rpcasync.h \ rpcdce.h \ diff --git a/include/oledb.idl b/include/oledb.idl index 3d47fe7..3f038c7 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -65,6 +65,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "row.idl" #include "rowchg.idl" #include "rowpos.idl" +#include "rowpsc.idl" #include "binres.idl" #include "crtrow.idl" #include "errrec.idl" diff --git a/include/rowpsc.idl b/include/rowpsc.idl new file mode 100644 index 0000000..2cbe8ac --- /dev/null +++ b/include/rowpsc.idl @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2013 Nikolay Sivov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + object, + uuid(0997a571-126e-11d0-9f8a-00a0c9a0631e), + pointer_default(unique) +] +interface IRowPositionChange : IUnknown +{ + [local] + HRESULT OnRowPositionChange([in] DBREASON reason, + [in] DBEVENTPHASE phase, + [in] BOOL cant_deny); + + [call_as(OnRowPositionChange)] + HRESULT RemoteOnRowPositionChange([in] DBREASON reason, + [in] DBEVENTPHASE phase, + [in] BOOL cant_deny, + [out] IErrorInfo **errorinfo); +} diff --git a/tools/make_makefiles b/tools/make_makefiles index 566ca0d..5f89683 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -156,6 +156,7 @@ my %private_idl_headers = ( "row.idl" => 1, "rowchg.idl" => 1, "rowpos.idl" => 1, + "rowpsc.idl" => 1, "rstbas.idl" => 1, "rstinf.idl" => 1, "rstloc.idl" => 1,

1 0

Nikolay Sivov : oledb32: Implement IRowPosition::Initialize().
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: 0e2e8386978df1a1dfe4e1336b59924e102a251f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e2e8386978df1a1dfe4e1336… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 1 07:53:48 2013 +0400 oledb32: Implement IRowPosition::Initialize(). --- dlls/oledb32/rowpos.c | 15 +++++++++++++-- include/oledberr.h | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/rowpos.c b/dlls/oledb32/rowpos.c index c7581b7..d789c19 100644 --- a/dlls/oledb32/rowpos.c +++ b/dlls/oledb32/rowpos.c @@ -23,6 +23,7 @@ #include "ole2.h" #include "oledb.h" +#include "oledberr.h" #include "oledb_private.h" #include "wine/debug.h" @@ -33,6 +34,8 @@ typedef struct { IRowPosition IRowPosition_iface; LONG ref; + + IRowset *rowset; } rowpos; static inline rowpos *impl_from_IRowPosition(IRowPosition *iface) @@ -79,7 +82,10 @@ static ULONG WINAPI rowpos_Release(IRowPosition* iface) TRACE("(%p)->(%d)\n", This, ref); if (ref == 0) + { + if (This->rowset) IRowset_Release(This->rowset); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -109,8 +115,12 @@ static HRESULT WINAPI rowpos_GetRowset(IRowPosition *iface, REFIID riid, IUnknow static HRESULT WINAPI rowpos_Initialize(IRowPosition *iface, IUnknown *rowset) { rowpos *This = impl_from_IRowPosition(iface); - FIXME("(%p)->(%p): stub\n", This, rowset); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, rowset); + + if (This->rowset) return DB_E_ALREADYINITIALIZED; + + return IUnknown_QueryInterface(rowset, &IID_IRowset, (void**)&This->rowset); } static HRESULT WINAPI rowpos_SetRowPosition(IRowPosition *iface, HCHAPTER chapter, @@ -148,6 +158,7 @@ HRESULT create_oledb_rowpos(IUnknown *outer, void **obj) This->IRowPosition_iface.lpVtbl = &rowpos_vtbl; This->ref = 1; + This->rowset = NULL; *obj = &This->IRowPosition_iface; diff --git a/include/oledberr.h b/include/oledberr.h index 9b87ba7..d1306e4 100644 --- a/include/oledberr.h +++ b/include/oledberr.h @@ -42,6 +42,7 @@ #define DB_E_BADPROPERTYVALUE 0x80040e44 #define DB_E_INVALID 0x80040e45 +#define DB_E_ALREADYINITIALIZED 0x80040e52 #define DB_E_DATAOVERFLOW 0x80040e57 #define DB_E_MISMATCHEDPROVIDER 0x80040e75

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2013