August 2013 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : ntdll/tests: Use WAIT_OBJECT_0 instead of 0.
by Alexandre Julliard Aug. 23, 2013

Aug. 23, 2013

Module: wine Branch: master Commit: 42cad0ebb1075842b73cd4b45bb5e0a9f8221da4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42cad0ebb1075842b73cd4b45… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 23 15:03:45 2013 +0900 ntdll/tests: Use WAIT_OBJECT_0 instead of 0. --- dlls/ntdll/tests/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 99e769e..9ce3834 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -81,7 +81,7 @@ static NTSTATUS (WINAPI *pNtQueryVolumeInformationFile)(HANDLE,PIO_STATUS_BLOCK, static inline BOOL is_signaled( HANDLE obj ) { - return WaitForSingleObject( obj, 0 ) == 0; + return WaitForSingleObject( obj, 0 ) == WAIT_OBJECT_0; } #define PIPENAME "\\\\.\\pipe\\ntdll_tests_file.c"

1 0

Dmitry Timoshkov : ntdll/tests: Add some tests for FILE_USE_FILE_POINTER_POSITION.
by Alexandre Julliard Aug. 23, 2013

Aug. 23, 2013

Module: wine Branch: master Commit: 49e31d29ca96892e462f6c4a53582f6796505ade URL: http://source.winehq.org/git/wine.git/?a=commit;h=49e31d29ca96892e462f6c4a5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 23 13:35:04 2013 +0900 ntdll/tests: Add some tests for FILE_USE_FILE_POINTER_POSITION. --- dlls/ntdll/tests/file.c | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index e30ada0..58bcdb1 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2001,7 +2001,8 @@ static void test_read_write(void) iob.Status = -1; iob.Information = -1; - status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, "DCBA", 4, NULL, NULL); + offset.QuadPart = (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */; + status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, "DCBA", 4, &offset, NULL); ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); ok(iob.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iob.Status); ok(iob.Information == 4, "expected 4, got %lu\n", iob.Information); @@ -2035,7 +2036,7 @@ todo_wine iob.Status = -1; iob.Information = -1; - offset.QuadPart = sizeof(contents); + offset.QuadPart = (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */; status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", status); todo_wine @@ -2139,6 +2140,17 @@ todo_wine iob.Status = -1; iob.Information = -1; + offset.QuadPart = (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */; + status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), &offset, NULL); +todo_wine + ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %#x\n", status); +todo_wine + ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); +todo_wine + ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information); + + iob.Status = -1; + iob.Information = -1; offset.QuadPart = 0; status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), &offset, NULL); todo_wine @@ -2175,8 +2187,15 @@ todo_wine ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information); + iob.Status = -1; + iob.Information = -1; offset.QuadPart = (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */; - offset.QuadPart = sizeof(contents); /* magic -2 doen't seem to work under win7 */ + status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); + ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %#x\n", status); + ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); + ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information); + + offset.QuadPart = sizeof(contents); S(U(ovl)).Offset = offset.u.LowPart; S(U(ovl)).OffsetHigh = offset.u.HighPart; ovl.Internal = -1;

1 0

Henri Verbeet : wined3d: Only update the stateblock's "changed" field if we 're recording.
by Alexandre Julliard Aug. 23, 2013

Aug. 23, 2013

Module: wine Branch: master Commit: b4d6f90f207adb8f548570529a4c3dfbecee5618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4d6f90f207adb8f548570529… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 23 10:18:16 2013 +0200 wined3d: Only update the stateblock's "changed" field if we're recording. --- dlls/wined3d/device.c | 106 +++++++++++++++++++++++++++------------------ dlls/wined3d/stateblock.c | 7 +-- 2 files changed, 66 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b4d6f90f207adb8f54857…

1 0

Henri Verbeet : wined3d: Keep track of contained indices in struct constant_heap itself.
by Alexandre Julliard Aug. 23, 2013

Aug. 23, 2013

Module: wine Branch: master Commit: 8b8e081d5f84228c3303dc108b7e50047f6a2120 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b8e081d5f84228c3303dc108… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 23 10:18:15 2013 +0200 wined3d: Keep track of contained indices in struct constant_heap itself. --- dlls/wined3d/glsl_shader.c | 34 +++++++++++++++++++++------------- 1 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 89ea459..4733cc3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -84,6 +84,7 @@ struct constant_entry struct constant_heap { struct constant_entry *entries; + BOOL *contained; unsigned int *positions; unsigned int size; }; @@ -932,12 +933,21 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context } } -static void update_heap_entry(const struct constant_heap *heap, unsigned int idx, - unsigned int heap_idx, DWORD new_version) +static void update_heap_entry(struct constant_heap *heap, unsigned int idx, DWORD new_version) { struct constant_entry *entries = heap->entries; unsigned int *positions = heap->positions; - unsigned int parent_idx; + unsigned int heap_idx, parent_idx; + + if (!heap->contained[idx]) + { + heap_idx = heap->size++; + heap->contained[idx] = TRUE; + } + else + { + heap_idx = positions[idx]; + } while (heap_idx > 1) { @@ -963,10 +973,7 @@ static void shader_glsl_update_float_vertex_constants(struct wined3d_device *dev for (i = start; i < count + start; ++i) { - if (!device->stateBlock->changed.vertexShaderConstantsF[i]) - update_heap_entry(heap, i, heap->size++, priv->next_constant_version); - else - update_heap_entry(heap, i, heap->positions[i], priv->next_constant_version); + update_heap_entry(heap, i, priv->next_constant_version); } for (i = 0; i < device->context_count; ++i) @@ -983,10 +990,7 @@ static void shader_glsl_update_float_pixel_constants(struct wined3d_device *devi for (i = start; i < count + start; ++i) { - if (!device->stateBlock->changed.pixelShaderConstantsF[i]) - update_heap_entry(heap, i, heap->size++, priv->next_constant_version); - else - update_heap_entry(heap, i, heap->positions[i], priv->next_constant_version); + update_heap_entry(heap, i, priv->next_constant_version); } for (i = 0; i < device->context_count; ++i) @@ -6475,7 +6479,9 @@ static int glsl_program_key_compare(const void *key, const struct wine_rb_entry static BOOL constant_heap_init(struct constant_heap *heap, unsigned int constant_count) { - SIZE_T size = (constant_count + 1) * sizeof(*heap->entries) + constant_count * sizeof(*heap->positions); + SIZE_T size = (constant_count + 1) * sizeof(*heap->entries) + + constant_count * sizeof(*heap->contained) + + constant_count * sizeof(*heap->positions); void *mem = HeapAlloc(GetProcessHeap(), 0, size); if (!mem) @@ -6486,7 +6492,9 @@ static BOOL constant_heap_init(struct constant_heap *heap, unsigned int constant heap->entries = mem; heap->entries[1].version = 0; - heap->positions = (unsigned int *)(heap->entries + constant_count + 1); + heap->contained = (BOOL *)(heap->entries + constant_count + 1); + memset(heap->contained, 0, constant_count * sizeof(*heap->contained)); + heap->positions = (unsigned int *)(heap->contained + constant_count); heap->size = 1; return TRUE;

1 0

Nikolay Sivov : oleaut32/tests: Some tests for QueryPathOfRegTypeLib() with activated context.
by Alexandre Julliard Aug. 23, 2013

Aug. 23, 2013

Module: wine Branch: master Commit: a1e28f70d1e9a66e3c206147e873d2eb4a811c17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1e28f70d1e9a66e3c206147e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 23 10:30:44 2013 +0400 oleaut32/tests: Some tests for QueryPathOfRegTypeLib() with activated context. --- dlls/oleaut32/tests/typelib.c | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index e5d61d8..5e15564 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1234,7 +1234,7 @@ static void test_QueryPathOfRegTypeLib(DWORD arch) for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { - ret = QueryPathOfRegTypeLib(&uid, td[i].maj, td[i].min, 0, &path); + ret = QueryPathOfRegTypeLib(&uid, td[i].maj, td[i].min, LOCALE_NEUTRAL, &path); ok(ret == td[i].ret, "QueryPathOfRegTypeLib(%u.%u) returned %08x\n", td[i].maj, td[i].min, ret); if (ret == S_OK) { @@ -4470,6 +4470,7 @@ static void test_LoadRegTypeLib(void) HANDLE handle; ITypeLib *tl; HRESULT hr; + BSTR path; BOOL ret; if (!pActivateActCtx) @@ -4495,9 +4496,35 @@ static void test_LoadRegTypeLib(void) hr = LoadRegTypeLib(&LIBID_register_test, 1, 0, LOCALE_NEUTRAL, &tl); ok(hr == TYPE_E_LIBNOTREGISTERED, "got 0x%08x\n", hr); + hr = QueryPathOfRegTypeLib(&LIBID_TestTypelib, 2, 0, LOCALE_NEUTRAL, &path); + ok(hr == TYPE_E_LIBNOTREGISTERED, "got 0x%08x\n", hr); + ret = pActivateActCtx(handle, &cookie); ok(ret, "ActivateActCtx failed: %u\n", GetLastError()); + path = NULL; + hr = QueryPathOfRegTypeLib(&LIBID_TestTypelib, 2, 0, LOCALE_NEUTRAL, &path); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(path); + + path = NULL; + hr = QueryPathOfRegTypeLib(&LIBID_TestTypelib, 2, 0, lcid_en, &path); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(path); + + path = NULL; + hr = QueryPathOfRegTypeLib(&LIBID_TestTypelib, 2, 0, lcid_ru, &path); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(path); + + path = NULL; + hr = QueryPathOfRegTypeLib(&LIBID_TestTypelib, 1, 0, LOCALE_NEUTRAL, &path); + ok(hr == TYPE_E_LIBNOTREGISTERED || broken(hr == S_OK) /* winxp */, "got 0x%08x\n", hr); + SysFreeString(path); + /* manifest version is 2.0, actual is 1.0 */ hr = LoadRegTypeLib(&LIBID_register_test, 1, 0, LOCALE_NEUTRAL, &tl); ok(hr == TYPE_E_LIBNOTREGISTERED || broken(hr == S_OK) /* winxp */, "got 0x%08x\n", hr);

1 0

Nikolay Sivov : ole32: GIT can be released on process detach only.
by Alexandre Julliard Aug. 23, 2013

Aug. 23, 2013

Module: wine Branch: master Commit: 98f3ecc32a06c97272cdf75bc95692024ce185b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98f3ecc32a06c97272cdf75bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 23 10:34:48 2013 +0400 ole32: GIT can be released on process detach only. --- dlls/ole32/compobj.c | 1 + dlls/ole32/compobj_private.h | 1 + dlls/ole32/git.c | 50 +++++++++++++++++++---------------------- dlls/ole32/tests/marshal.c | 11 +++++++++ 4 files changed, 36 insertions(+), 27 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 45376d1..4d708c4 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4590,6 +4590,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID reserved) case DLL_PROCESS_DETACH: if (reserved) break; + release_std_git(); COMPOBJ_UninitProcess(); RPC_UnregisterAllChannelHooks(); COMPOBJ_DllList_Free(); diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 6352553..0f4519b 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -174,6 +174,7 @@ struct oletls /* Global Interface Table Functions */ extern IGlobalInterfaceTable *get_std_git(void) DECLSPEC_HIDDEN; +extern void release_std_git(void) DECLSPEC_HIDDEN; extern HRESULT StdGlobalInterfaceTable_GetFactory(LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY *key) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index f0be9ee..4d44e39 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -66,7 +66,6 @@ typedef struct StdGlobalInterfaceTableImpl { IGlobalInterfaceTable IGlobalInterfaceTable_iface; - ULONG ref; struct list list; ULONG nextCookie; @@ -89,16 +88,6 @@ static inline StdGlobalInterfaceTableImpl *impl_from_IGlobalInterfaceTable(IGlob return CONTAINING_RECORD(iface, StdGlobalInterfaceTableImpl, IGlobalInterfaceTable_iface); } -/** This destroys it again. It should revoke all the held interfaces first **/ -static void StdGlobalInterfaceTable_Destroy(void* This) -{ - TRACE("(%p)\n", This); - FIXME("Revoke held interfaces here\n"); - - HeapFree(GetProcessHeap(), 0, This); - std_git = NULL; -} - /*** * A helper function to traverse the list and find the entry that matches the cookie. * Returns NULL if not found. Must be called inside git_section critical section. @@ -147,25 +136,13 @@ StdGlobalInterfaceTable_QueryInterface(IGlobalInterfaceTable* iface, static ULONG WINAPI StdGlobalInterfaceTable_AddRef(IGlobalInterfaceTable* iface) { - StdGlobalInterfaceTableImpl* const This = impl_from_IGlobalInterfaceTable(iface); - - /* InterlockedIncrement(&This->ref); */ - return This->ref; + return 1; } static ULONG WINAPI StdGlobalInterfaceTable_Release(IGlobalInterfaceTable* iface) { - StdGlobalInterfaceTableImpl* const This = impl_from_IGlobalInterfaceTable(iface); - - /* InterlockedDecrement(&This->ref); */ - if (This->ref == 0) { - /* Hey ho, it's time to go, so long again 'till next weeks show! */ - StdGlobalInterfaceTable_Destroy(This); - return 0; - } - - return This->ref; + return 1; } /*** @@ -387,13 +364,12 @@ IGlobalInterfaceTable* get_std_git(void) if (!newGIT) return NULL; newGIT->IGlobalInterfaceTable_iface.lpVtbl = &StdGlobalInterfaceTableImpl_Vtbl; - newGIT->ref = 1; list_init(&newGIT->list); newGIT->nextCookie = 0xf100; /* that's where windows starts, so that's where we start */ if (InterlockedCompareExchangePointer((void**)&std_git, &newGIT->IGlobalInterfaceTable_iface, NULL)) { - StdGlobalInterfaceTable_Destroy(newGIT); + HeapFree(GetProcessHeap(), 0, newGIT); } else TRACE("Created the GIT at %p\n", newGIT); @@ -401,3 +377,23 @@ IGlobalInterfaceTable* get_std_git(void) return std_git; } + +void release_std_git(void) +{ + StdGlobalInterfaceTableImpl *git; + StdGITEntry *entry, *entry2; + + if (!std_git) return; + + git = impl_from_IGlobalInterfaceTable(std_git); + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &git->list, StdGITEntry, entry) + { + list_remove(&entry->entry); + + CoReleaseMarshalData(entry->stream); + IStream_Release(entry->stream); + HeapFree(GetProcessHeap(), 0, entry); + } + + HeapFree(GetProcessHeap(), 0, git); +} diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 9566de3..383e5b0 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2806,6 +2806,7 @@ static void test_globalinterfacetable(void) DWORD ret; IUnknown *object; IClassFactory *cf; + ULONG ref; trace("test_globalinterfacetable\n"); cLocks = 0; @@ -2821,6 +2822,16 @@ static void test_globalinterfacetable(void) hr = CoCreateInstance(&CLSID_StdGlobalInterfaceTable, NULL, CLSCTX_INPROC_SERVER, &IID_IGlobalInterfaceTable, (void **)&git); ok_ole_success(hr, CoCreateInstance); + ref = IGlobalInterfaceTable_AddRef(git); + ok(ref == 1, "ref=%d\n", ref); + ref = IGlobalInterfaceTable_AddRef(git); + ok(ref == 1, "ref=%d\n", ref); + + ref = IGlobalInterfaceTable_Release(git); + ok(ref == 1, "ref=%d\n", ref); + ref = IGlobalInterfaceTable_Release(git); + ok(ref == 1, "ref=%d\n", ref); + hr = IGlobalInterfaceTable_RegisterInterfaceInGlobal(git, (IUnknown *)&Test_ClassFactory, &IID_IClassFactory, &cookie); ok_ole_success(hr, IGlobalInterfaceTable_RegisterInterfaceInGlobal);

1 0

Nikolay Sivov : oledb32: Implement GetRowPosition().
by Alexandre Julliard Aug. 23, 2013

Aug. 23, 2013

Module: wine Branch: master Commit: 05528ea01ba14fe42aca895ed67f7ee38ff37618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05528ea01ba14fe42aca895ed… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 23 10:33:59 2013 +0400 oledb32: Implement GetRowPosition(). --- dlls/oledb32/rowpos.c | 26 ++++++++++++++++++++++---- dlls/oledb32/tests/database.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/rowpos.c b/dlls/oledb32/rowpos.c index cca3192..2b932c9 100644 --- a/dlls/oledb32/rowpos.c +++ b/dlls/oledb32/rowpos.c @@ -47,6 +47,9 @@ struct rowpos LONG ref; IRowset *rowset; + HROW row; + HCHAPTER chapter; + DBPOSITIONFLAGS flags; rowpos_cp cp; }; @@ -83,6 +86,13 @@ static HRESULT rowpos_fireevent(rowpos *rp, DBREASON reason, DBEVENTPHASE phase) return hr; } +static void rowpos_clearposition(rowpos *rp) +{ + rp->row = DB_NULL_HROW; + rp->chapter = DB_NULL_HCHAPTER; + rp->flags = DBPOSITION_NOROW; +} + static HRESULT WINAPI rowpos_QueryInterface(IRowPosition* iface, REFIID riid, void **obj) { rowpos *This = impl_from_IRowPosition(iface); @@ -152,8 +162,7 @@ static HRESULT WINAPI rowpos_ClearRowPosition(IRowPosition* iface) if (hr != S_OK) return rowpos_fireevent(This, DBREASON_ROWPOSITION_CLEARED, DBEVENTPHASE_FAILEDTODO); - /* FIXME: actually clear stored data */ - + rowpos_clearposition(This); return S_OK; } @@ -161,8 +170,16 @@ static HRESULT WINAPI rowpos_GetRowPosition(IRowPosition *iface, HCHAPTER *chapt HROW *row, DBPOSITIONFLAGS *flags) { rowpos *This = impl_from_IRowPosition(iface); - FIXME("(%p)->(%p %p %p): stub\n", This, chapter, row, flags); - return E_NOTIMPL; + + TRACE("(%p)->(%p %p %p)\n", This, chapter, row, flags); + + *chapter = This->chapter; + *row = This->row; + *flags = This->flags; + + if (!This->rowset) return E_UNEXPECTED; + + return S_OK; } static HRESULT WINAPI rowpos_GetRowset(IRowPosition *iface, REFIID riid, IUnknown **rowset) @@ -417,6 +434,7 @@ HRESULT create_oledb_rowpos(IUnknown *outer, void **obj) This->IConnectionPointContainer_iface.lpVtbl = &rowpos_cpc_vtbl; This->ref = 1; This->rowset = NULL; + rowpos_clearposition(This); rowposchange_cp_init(&This->cp, This); *obj = &This->IRowPosition_iface; diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index ac809ef..7801bf8 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -471,9 +471,12 @@ static void init_onchange_sink(IRowPosition *rowpos) static void test_rowpos_clearrowposition(void) { + DBPOSITIONFLAGS flags; IRowPosition *rowpos; + HCHAPTER chapter; IUnknown *unk; HRESULT hr; + HROW row; hr = CoCreateInstance(&CLSID_OLEDB_ROWPOSITIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IRowPosition, (void**)&rowpos); ok(hr == S_OK, "got %08x\n", hr); @@ -484,10 +487,28 @@ static void test_rowpos_clearrowposition(void) hr = IRowPosition_GetRowset(rowpos, &IID_IStream, &unk); ok(hr == E_UNEXPECTED, "got %08x\n", hr); + chapter = 1; + row = 1; + flags = DBPOSITION_OK; + hr = IRowPosition_GetRowPosition(rowpos, &chapter, &row, &flags); + ok(hr == E_UNEXPECTED, "got %08x\n", hr); + ok(chapter == DB_NULL_HCHAPTER, "got %ld\n", chapter); + ok(row == DB_NULL_HROW, "got %ld\n", row); + ok(flags == DBPOSITION_NOROW, "got %d\n", flags); + init_test_rset(); hr = IRowPosition_Initialize(rowpos, (IUnknown*)&test_rset.IRowset_iface); ok(hr == S_OK, "got %08x\n", hr); + chapter = 1; + row = 1; + flags = DBPOSITION_OK; + hr = IRowPosition_GetRowPosition(rowpos, &chapter, &row, &flags); + ok(hr == S_OK, "got %08x\n", hr); + ok(chapter == DB_NULL_HCHAPTER, "got %ld\n", chapter); + ok(row == DB_NULL_HROW, "got %ld\n", row); + ok(flags == DBPOSITION_NOROW, "got %d\n", flags); + hr = IRowPosition_GetRowset(rowpos, &IID_IRowset, &unk); ok(hr == S_OK, "got %08x\n", hr); @@ -495,6 +516,15 @@ static void test_rowpos_clearrowposition(void) hr = IRowPosition_ClearRowPosition(rowpos); ok(hr == S_OK, "got %08x\n", hr); + chapter = 1; + row = 1; + flags = DBPOSITION_OK; + hr = IRowPosition_GetRowPosition(rowpos, &chapter, &row, &flags); + ok(hr == S_OK, "got %08x\n", hr); + ok(chapter == DB_NULL_HCHAPTER, "got %ld\n", chapter); + ok(row == DB_NULL_HROW, "got %ld\n", row); + ok(flags == DBPOSITION_NOROW, "got %d\n", flags); + IRowPosition_Release(rowpos); }

1 0

Nikolay Sivov : oledb32: Implement IRowPosition_GetRowset().
by Alexandre Julliard Aug. 23, 2013

Aug. 23, 2013

Module: wine Branch: master Commit: 149c392e099fd1cdad5afe48b7897d898f1adf2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=149c392e099fd1cdad5afe48b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 23 10:33:35 2013 +0400 oledb32: Implement IRowPosition_GetRowset(). --- dlls/oledb32/rowpos.c | 7 +++++-- dlls/oledb32/tests/database.c | 7 +++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/rowpos.c b/dlls/oledb32/rowpos.c index a6c68b8..cca3192 100644 --- a/dlls/oledb32/rowpos.c +++ b/dlls/oledb32/rowpos.c @@ -168,8 +168,11 @@ static HRESULT WINAPI rowpos_GetRowPosition(IRowPosition *iface, HCHAPTER *chapt static HRESULT WINAPI rowpos_GetRowset(IRowPosition *iface, REFIID riid, IUnknown **rowset) { rowpos *This = impl_from_IRowPosition(iface); - FIXME("(%p)->(%s %p): stub\n", This, debugstr_guid(riid), rowset); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), rowset); + + if (!This->rowset) return E_UNEXPECTED; + return IRowset_QueryInterface(This->rowset, riid, (void**)rowset); } static HRESULT WINAPI rowpos_Initialize(IRowPosition *iface, IUnknown *rowset) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index f42f189..ac809ef 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -472,6 +472,7 @@ static void init_onchange_sink(IRowPosition *rowpos) static void test_rowpos_clearrowposition(void) { IRowPosition *rowpos; + IUnknown *unk; HRESULT hr; hr = CoCreateInstance(&CLSID_OLEDB_ROWPOSITIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IRowPosition, (void**)&rowpos); @@ -480,10 +481,16 @@ static void test_rowpos_clearrowposition(void) hr = IRowPosition_ClearRowPosition(rowpos); ok(hr == E_UNEXPECTED, "got %08x\n", hr); + hr = IRowPosition_GetRowset(rowpos, &IID_IStream, &unk); + ok(hr == E_UNEXPECTED, "got %08x\n", hr); + init_test_rset(); hr = IRowPosition_Initialize(rowpos, (IUnknown*)&test_rset.IRowset_iface); ok(hr == S_OK, "got %08x\n", hr); + hr = IRowPosition_GetRowset(rowpos, &IID_IRowset, &unk); + ok(hr == S_OK, "got %08x\n", hr); + init_onchange_sink(rowpos); hr = IRowPosition_ClearRowPosition(rowpos); ok(hr == S_OK, "got %08x\n", hr);

1 0

Nikolay Sivov : oledb32: Implement IRowPosition_ClearRowPosition() with events.
by Alexandre Julliard Aug. 23, 2013

Aug. 23, 2013

Module: wine Branch: master Commit: def652e594517d9307e1990504eaa211e0c213bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=def652e594517d9307e199050… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 23 10:33:09 2013 +0400 oledb32: Implement IRowPosition_ClearRowPosition() with events. --- dlls/oledb32/rowpos.c | 37 ++++++++++++++++++- dlls/oledb32/tests/database.c | 78 +++++++++++++++++++++++++++++++++++++++++ include/dbs.idl | 36 +++++++++++++++++++ include/oledb.idl | 2 - include/oledberr.h | 1 + 5 files changed, 150 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/rowpos.c b/dlls/oledb32/rowpos.c index d322a9d..a6c68b8 100644 --- a/dlls/oledb32/rowpos.c +++ b/dlls/oledb32/rowpos.c @@ -67,6 +67,22 @@ static inline rowpos_cp *impl_from_IConnectionPoint(IConnectionPoint *iface) return CONTAINING_RECORD(iface, rowpos_cp, IConnectionPoint_iface); } +static HRESULT rowpos_fireevent(rowpos *rp, DBREASON reason, DBEVENTPHASE phase) +{ + HRESULT hr = S_OK; + DWORD i; + + for (i = 0; i < rp->cp.sinks_size; i++) + if (rp->cp.sinks[i]) + { + hr = IRowPositionChange_OnRowPositionChange(rp->cp.sinks[i], reason, phase, phase == DBEVENTPHASE_FAILEDTODO); + if (phase == DBEVENTPHASE_FAILEDTODO) return DB_E_CANCELED; + if (hr != S_OK) return hr; + } + + return hr; +} + static HRESULT WINAPI rowpos_QueryInterface(IRowPosition* iface, REFIID riid, void **obj) { rowpos *This = impl_from_IRowPosition(iface); @@ -122,8 +138,23 @@ static ULONG WINAPI rowpos_Release(IRowPosition* iface) static HRESULT WINAPI rowpos_ClearRowPosition(IRowPosition* iface) { rowpos *This = impl_from_IRowPosition(iface); - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p)\n", This); + + if (!This->rowset) return E_UNEXPECTED; + + hr = rowpos_fireevent(This, DBREASON_ROWPOSITION_CLEARED, DBEVENTPHASE_OKTODO); + if (hr != S_OK) + return rowpos_fireevent(This, DBREASON_ROWPOSITION_CLEARED, DBEVENTPHASE_FAILEDTODO); + + hr = rowpos_fireevent(This, DBREASON_ROWPOSITION_CLEARED, DBEVENTPHASE_ABOUTTODO); + if (hr != S_OK) + return rowpos_fireevent(This, DBREASON_ROWPOSITION_CLEARED, DBEVENTPHASE_FAILEDTODO); + + /* FIXME: actually clear stored data */ + + return S_OK; } static HRESULT WINAPI rowpos_GetRowPosition(IRowPosition *iface, HCHAPTER *chapter, @@ -277,6 +308,8 @@ static HRESULT WINAPI rowpos_cp_Advise(IConnectionPoint *iface, IUnknown *unksin TRACE("(%p)->(%p %p)\n", This, unksink, cookie); + if (!cookie) return E_POINTER; + hr = IUnknown_QueryInterface(unksink, &IID_IRowPositionChange, (void**)&sink); if (FAILED(hr)) { diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 585196c..f42f189 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -414,6 +414,83 @@ static void test_rowpos_initialize(void) IRowPosition_Release(rowpos); } +static HRESULT WINAPI onchange_QI(IRowPositionChange *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IRowPositionChange)) + { + *obj = iface; + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI onchange_AddRef(IRowPositionChange *iface) +{ + return 2; +} + +static ULONG WINAPI onchange_Release(IRowPositionChange *iface) +{ + return 1; +} + +static HRESULT WINAPI onchange_OnRowPositionChange(IRowPositionChange *iface, DBREASON reason, + DBEVENTPHASE phase, BOOL cant_deny) +{ + trace("%d %d %d\n", reason, phase, cant_deny); + return S_OK; +} + +static const IRowPositionChangeVtbl onchange_vtbl = { + onchange_QI, + onchange_AddRef, + onchange_Release, + onchange_OnRowPositionChange +}; + +static IRowPositionChange onchangesink = { &onchange_vtbl }; + +static void init_onchange_sink(IRowPosition *rowpos) +{ + IConnectionPointContainer *cpc; + IConnectionPoint *cp; + DWORD cookie; + HRESULT hr; + + hr = IRowPosition_QueryInterface(rowpos, &IID_IConnectionPointContainer, (void**)&cpc); + ok(hr == S_OK, "got %08x\n", hr); + hr = IConnectionPointContainer_FindConnectionPoint(cpc, &IID_IRowPositionChange, &cp); + ok(hr == S_OK, "got %08x\n", hr); + hr = IConnectionPoint_Advise(cp, (IUnknown*)&onchangesink, &cookie); + ok(hr == S_OK, "got %08x\n", hr); + IConnectionPoint_Release(cp); + IConnectionPointContainer_Release(cpc); +} + +static void test_rowpos_clearrowposition(void) +{ + IRowPosition *rowpos; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_OLEDB_ROWPOSITIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IRowPosition, (void**)&rowpos); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IRowPosition_ClearRowPosition(rowpos); + ok(hr == E_UNEXPECTED, "got %08x\n", hr); + + init_test_rset(); + hr = IRowPosition_Initialize(rowpos, (IUnknown*)&test_rset.IRowset_iface); + ok(hr == S_OK, "got %08x\n", hr); + + init_onchange_sink(rowpos); + hr = IRowPosition_ClearRowPosition(rowpos); + ok(hr == S_OK, "got %08x\n", hr); + + IRowPosition_Release(rowpos); +} + START_TEST(database) { OleInitialize(NULL); @@ -425,6 +502,7 @@ START_TEST(database) /* row position */ test_rowposition(); test_rowpos_initialize(); + test_rowpos_clearrowposition(); OleUninitialize(); } diff --git a/include/dbs.idl b/include/dbs.idl index 46deb6a..ceb9773 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -686,3 +686,39 @@ typedef struct tagDBTIMESTAMP { USHORT second; ULONG fraction; } DBTIMESTAMP; + +typedef DWORD DBREASON; +typedef DWORD DBEVENTPHASE; + +enum DBEVENTPHASEENUM { + DBEVENTPHASE_OKTODO, + DBEVENTPHASE_ABOUTTODO, + DBEVENTPHASE_SYNCHAFTER, + DBEVENTPHASE_FAILEDTODO, + DBEVENTPHASE_DIDEVENT +}; + +enum DBREASONENUM { + DBREASON_ROWSET_FETCHPOSITIONCHANGE, + DBREASON_ROWSET_RELEASE, + DBREASON_COLUMN_SET, + DBREASON_COLUMN_RECALCULATED, + DBREASON_ROW_ACTIVATE, + DBREASON_ROW_RELEASE, + DBREASON_ROW_DELETE, + DBREASON_ROW_FIRSTCHANCE, + DBREASON_ROW_INSERT, + DBREASON_ROW_RESYNCH, + DBREASON_ROW_UNDOCHANGE, + DBREASON_ROW_UNDOINSERT, + DBREASON_ROW_UNDODELETE, + DBREASON_ROW_UPDATE, + DBREASON_ROWSET_CHANGED +}; + +enum DBREASONENUM15 { + DBREASON_ROWPOSITION_CHANGED = DBREASON_ROWSET_CHANGED + 1, + DBREASON_ROWPOSITION_CHAPTERCHANGED, + DBREASON_ROWPOSITION_CLEARED, + DBREASON_ROW_ASYNCHINSERT +}; diff --git a/include/oledb.idl b/include/oledb.idl index 34cbd34..8d7f001 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -34,8 +34,6 @@ typedef LONG_PTR DBROWCOUNT; typedef ULONG_PTR DBCOUNTITEM; typedef ULONG_PTR DBLENGTH; typedef ULONG_PTR DBORDINAL; -typedef DWORD DBREASON; -typedef DWORD DBEVENTPHASE; typedef ULONG_PTR DBBKMARK; typedef DWORD_PTR DB_DWRESERVE; typedef ULONG_PTR DBREFCOUNT; diff --git a/include/oledberr.h b/include/oledberr.h index c739d23..96adcae 100644 --- a/include/oledberr.h +++ b/include/oledberr.h @@ -63,6 +63,7 @@ #define DB_E_BADACCESSORTYPE 0x80040e4b #define DB_E_WRITEONLYACCESSOR 0x80040e4c #define DB_SEC_E_AUTH_FAILED 0x80040e4d +#define DB_E_CANCELED 0x80040e4e #define DB_E_ALREADYINITIALIZED 0x80040e52 #define DB_E_DATAOVERFLOW 0x80040e57

1 0

Charles Davis : winemac.drv: Support the public UTF-16 type for Unicode text.
by Alexandre Julliard Aug. 23, 2013

Aug. 23, 2013

Module: wine Branch: master Commit: a157c7bd81fc5ed2739c107a0c4adf3164afb85e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a157c7bd81fc5ed2739c107a0… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Wed Aug 21 23:07:11 2013 -0600 winemac.drv: Support the public UTF-16 type for Unicode text. --- dlls/winemac.drv/clipboard.c | 169 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 169 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 53b1448..80fd689 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -82,14 +82,20 @@ static HANDLE import_unicodetext_to_text(CFDataRef data); static HANDLE import_utf8_to_oemtext(CFDataRef data); static HANDLE import_utf8_to_text(CFDataRef data); static HANDLE import_utf8_to_unicodetext(CFDataRef data); +static HANDLE import_utf16_to_oemtext(CFDataRef data); +static HANDLE import_utf16_to_text(CFDataRef data); +static HANDLE import_utf16_to_unicodetext(CFDataRef data); static CFDataRef export_clipboard_data(HANDLE data); static CFDataRef export_bitmap_to_bmp(HANDLE data); static CFDataRef export_dib_to_bmp(HANDLE data); static CFDataRef export_hdrop_to_filenames(HANDLE data); static CFDataRef export_oemtext_to_utf8(HANDLE data); +static CFDataRef export_oemtext_to_utf16(HANDLE data); static CFDataRef export_text_to_utf8(HANDLE data); +static CFDataRef export_text_to_utf16(HANDLE data); static CFDataRef export_unicodetext_to_utf8(HANDLE data); +static CFDataRef export_unicodetext_to_utf16(HANDLE data); /************************************************************************** @@ -180,6 +186,10 @@ static const struct { CF_TEXT, CFSTR("public.utf8-plain-text"), import_utf8_to_text, export_text_to_utf8, TRUE }, { CF_OEMTEXT, CFSTR("public.utf8-plain-text"), import_utf8_to_oemtext, export_oemtext_to_utf8, TRUE }, + { CF_UNICODETEXT, CFSTR("public.utf16-plain-text"), import_utf16_to_unicodetext, export_unicodetext_to_utf16,TRUE }, + { CF_TEXT, CFSTR("public.utf16-plain-text"), import_utf16_to_text, export_text_to_utf16, TRUE }, + { CF_OEMTEXT, CFSTR("public.utf16-plain-text"), import_utf16_to_oemtext, export_oemtext_to_utf16, TRUE }, + { CF_DIB, CFSTR("org.winehq.builtin.dib"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_DIB, CFSTR("com.microsoft.bmp"), import_bmp_to_dib, export_dib_to_bmp, TRUE }, @@ -953,6 +963,78 @@ static HANDLE import_utf8_to_unicodetext(CFDataRef data) /************************************************************************** + * import_utf16_to_oemtext + * + * Import a UTF-16 string, converting the string to CF_OEMTEXT. + */ +static HANDLE import_utf16_to_oemtext(CFDataRef data) +{ + HANDLE unicode_handle = import_utf16_to_unicodetext(data); + HANDLE ret = convert_unicodetext_to_codepage(unicode_handle, CP_OEMCP); + + GlobalFree(unicode_handle); + return ret; +} + + +/************************************************************************** + * import_utf16_to_text + * + * Import a UTF-16 string, converting the string to CF_TEXT. + */ +static HANDLE import_utf16_to_text(CFDataRef data) +{ + HANDLE unicode_handle = import_utf16_to_unicodetext(data); + HANDLE ret = convert_unicodetext_to_codepage(unicode_handle, CP_ACP); + + GlobalFree(unicode_handle); + return ret; +} + + +/************************************************************************** + * import_utf16_to_unicodetext + * + * Import a UTF-8 string, converting the string to CF_UNICODETEXT. + */ +static HANDLE import_utf16_to_unicodetext(CFDataRef data) +{ + const WCHAR *src; + unsigned long data_len; + unsigned long new_lines = 0; + LPWSTR dst; + unsigned long i, j; + HANDLE unicode_handle; + + src = (const WCHAR *)CFDataGetBytePtr(data); + data_len = CFDataGetLength(data); + for (i = 0; i < data_len; i++) + { + if (src[i] == '\n') + new_lines++; + } + + if ((unicode_handle = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, (data_len + new_lines + 1) * sizeof(WCHAR)))) + { + dst = GlobalLock(unicode_handle); + + for (i = 0, j = 0; i < data_len; i++) + { + if (src[i] == '\n') + dst[j++] = '\r'; + + dst[j++] = src[i]; + } + dst[j] = 0; + + GlobalUnlock(unicode_handle); + } + + return unicode_handle; +} + + +/************************************************************************** * export_clipboard_data * * Generic export clipboard data routine. @@ -1020,6 +1102,30 @@ static CFDataRef export_codepage_to_utf8(HANDLE data, UINT cp) /************************************************************************** + * export_codepage_to_utf16 + * + * Export string data in a specified codepage to UTF-16. + */ +static CFDataRef export_codepage_to_utf16(HANDLE data, UINT cp) +{ + CFDataRef ret = NULL; + const char* str; + + if ((str = GlobalLock(data))) + { + HANDLE unicode = convert_text(str, GlobalSize(data), cp, -1); + + ret = export_unicodetext_to_utf16(unicode); + + GlobalFree(unicode); + GlobalUnlock(data); + } + + return ret; +} + + +/************************************************************************** * export_dib_to_bmp * * Export CF_DIB to BMP file format. This just entails prepending a BMP @@ -1162,6 +1268,17 @@ static CFDataRef export_oemtext_to_utf8(HANDLE data) /************************************************************************** + * export_oemtext_to_utf16 + * + * Export CF_OEMTEXT to UTF-16. + */ +static CFDataRef export_oemtext_to_utf16(HANDLE data) +{ + return export_codepage_to_utf16(data, CP_OEMCP); +} + + +/************************************************************************** * export_text_to_utf8 * * Export CF_TEXT to UTF-8. @@ -1173,6 +1290,17 @@ static CFDataRef export_text_to_utf8(HANDLE data) /************************************************************************** + * export_text_to_utf16 + * + * Export CF_TEXT to UTF-16. + */ +static CFDataRef export_text_to_utf16(HANDLE data) +{ + return export_codepage_to_utf16(data, CP_ACP); +} + + +/************************************************************************** * export_unicodetext_to_utf8 * * Export CF_UNICODETEXT to UTF-8. @@ -1215,6 +1343,47 @@ static CFDataRef export_unicodetext_to_utf8(HANDLE data) /************************************************************************** + * export_unicodetext_to_utf16 + * + * Export CF_UNICODETEXT to UTF-16. + */ +static CFDataRef export_unicodetext_to_utf16(HANDLE data) +{ + CFMutableDataRef ret; + const WCHAR *src; + INT dst_len; + + src = GlobalLock(data); + if (!src) return NULL; + + dst_len = GlobalSize(data) / sizeof(WCHAR); + if (dst_len) dst_len--; /* Leave off null terminator. */ + ret = CFDataCreateMutable(NULL, dst_len); + if (ret) + { + LPWSTR dst; + int i, j; + + CFDataSetLength(ret, dst_len); + dst = (LPWSTR)CFDataGetMutableBytePtr(ret); + + /* Remove carriage returns */ + for (i = 0, j = 0; i < dst_len; i++) + { + if (src[i] == '\r' && + (i + 1 >= dst_len || src[i + 1] == '\n' || src[i + 1] == '\0')) + continue; + dst[j++] = src[i]; + } + CFDataSetLength(ret, j); + } + GlobalUnlock(data); + + return ret; +} + + +/************************************************************************** * get_clipboard_info */ static BOOL get_clipboard_info(LPCLIPBOARDINFO cbinfo)

1 0