wine-commits May 2013

wine-commits@winehq.org

2 participants
498 discussions

Marcus Meissner : wininet: Avoid one-byte overflows (Coverity).
by Alexandre Julliard 31 May '13

31 May '13

Module: wine Branch: master Commit: 038e3d3773d44738320f1381abdb88454ff92cdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=038e3d3773d44738320f1381a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu May 30 20:27:10 2013 +0200 wininet: Avoid one-byte overflows (Coverity). --- dlls/wininet/tests/http.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index b42e732..f4d0b43 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2835,13 +2835,13 @@ static void test_cache_read_gzipped(int port) buf[size] = 0; ok(!strncmp(buf, content, size), "incorrect page content: %s\n", buf); - size = sizeof(buf); + size = sizeof(buf)-1; ret = HttpQueryInfoA(req, HTTP_QUERY_CONTENT_TYPE, buf, &size, 0); ok(ret, "HttpQueryInfo(HTTP_QUERY_CONTENT_TYPE) failed: %d\n", GetLastError()); buf[size] = 0; ok(!strncmp(text_html, buf, size), "buf = %s\n", buf); - size = sizeof(buf); + size = sizeof(buf)-1; ret = HttpQueryInfoA(req, HTTP_QUERY_RAW_HEADERS_CRLF, buf, &size, 0); ok(ret, "HttpQueryInfo(HTTP_QUERY_CONTENT_TYPE) failed: %d\n", GetLastError()); buf[size] = 0; @@ -2858,7 +2858,7 @@ static void test_cache_read_gzipped(int port) ret = HttpSendRequest(req, "Accept-Encoding: gzip", -1, NULL, 0); ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); size = 0; - while(InternetReadFile(req, buf+size, sizeof(buf)-size, &read) && read) + while(InternetReadFile(req, buf+size, sizeof(buf)-1-size, &read) && read) size += read; todo_wine ok(size == 10, "read %d bytes of data\n", size); buf[size] = 0; @@ -2870,7 +2870,7 @@ static void test_cache_read_gzipped(int port) "HttpQueryInfo(HTTP_QUERY_CONTENT_ENCODING) returned %d, %d\n", ret, GetLastError()); - size = sizeof(buf); + size = sizeof(buf)-1; ret = HttpQueryInfoA(req, HTTP_QUERY_CONTENT_TYPE, buf, &size, 0); todo_wine ok(ret, "HttpQueryInfo(HTTP_QUERY_CONTENT_TYPE) failed: %d\n", GetLastError()); buf[size] = 0; @@ -2888,7 +2888,7 @@ static void test_cache_read_gzipped(int port) ret = HttpSendRequest(req, "Accept-Encoding: gzip", -1, NULL, 0); ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); size = 0; - while(InternetReadFile(req, buf+size, sizeof(buf)-size, &read) && read) + while(InternetReadFile(req, buf+size, sizeof(buf)-1-size, &read) && read) size += read; ok(size == 31, "read %d bytes of data\n", size); InternetCloseHandle(req); @@ -2903,7 +2903,7 @@ static void test_cache_read_gzipped(int port) ret = HttpSendRequest(req, "Accept-Encoding: gzip", -1, NULL, 0); ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); size = 0; - while(InternetReadFile(req, buf+size, sizeof(buf)-size, &read) && read) + while(InternetReadFile(req, buf+size, sizeof(buf)-1-size, &read) && read) size += read; todo_wine ok(size == 31, "read %d bytes of data\n", size);

1 0

Aric Stewart : macdrv: Rework the way we handle cursor position and composition text.
by Alexandre Julliard 30 May '13

30 May '13

Module: wine Branch: master Commit: c6d307533b87d780937c4118f9c3f158dd314b8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6d307533b87d780937c4118f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed May 29 13:11:57 2013 -0500 macdrv: Rework the way we handle cursor position and composition text. --- dlls/winemac.drv/cocoa_window.m | 9 +---- dlls/winemac.drv/event.c | 5 -- dlls/winemac.drv/ime.c | 85 ++++++++++++-------------------------- dlls/winemac.drv/macdrv.h | 1 - dlls/winemac.drv/macdrv_cocoa.h | 6 +-- 5 files changed, 29 insertions(+), 77 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index a47715a..5ee1aac 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -356,14 +356,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) event->im_set_text.data = [window imeData]; event->im_set_text.text = (CFStringRef)[[markedText string] copy]; event->im_set_text.complete = FALSE; - - [[window queue] postEvent:event]; - - macdrv_release_event(event); - - event = macdrv_create_event(IM_SET_CURSOR_POS, window); - event->im_set_cursor_pos.data = [window imeData]; - event->im_set_cursor_pos.pos = markedTextSelection.location; + event->im_set_text.cursor_pos = markedTextSelection.location; [[window queue] postEvent:event]; diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 51f6723..deac187 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -35,7 +35,6 @@ static const char *dbgstr_event(int type) "APP_DEACTIVATED", "APP_QUIT_REQUESTED", "DISPLAYS_CHANGED", - "IM_SET_CURSOR_POS", "IM_SET_TEXT", "KEY_PRESS", "KEY_RELEASE", @@ -92,7 +91,6 @@ static macdrv_event_mask get_event_mask(DWORD mask) event_mask |= event_mask_for_type(APP_DEACTIVATED); event_mask |= event_mask_for_type(APP_QUIT_REQUESTED); event_mask |= event_mask_for_type(DISPLAYS_CHANGED); - event_mask |= event_mask_for_type(IM_SET_CURSOR_POS); event_mask |= event_mask_for_type(IM_SET_TEXT); event_mask |= event_mask_for_type(STATUS_ITEM_CLICKED); event_mask |= event_mask_for_type(WINDOW_CLOSE_REQUESTED); @@ -181,9 +179,6 @@ void macdrv_handle_event(const macdrv_event *event) case DISPLAYS_CHANGED: macdrv_displays_changed(event); break; - case IM_SET_CURSOR_POS: - macdrv_im_set_cursor_pos(event); - break; case IM_SET_TEXT: macdrv_im_set_text(event); break; diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 44d5d8b..bed094d 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -940,15 +940,14 @@ UINT WINAPI ImeEnumRegisterWord(REGISTERWORDENUMPROCW lpfnEnumProc, LPCWSTR lpsz return 0; } -BOOL WINAPI ImeSetCompositionString(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, DWORD dwCompLen, - LPCVOID lpRead, DWORD dwReadLen) +static BOOL IME_SetCompositionString(void* hIMC, DWORD dwIndex, LPCVOID lpComp, DWORD dwCompLen, DWORD cursor_pos, BOOL cursor_valid) { LPINPUTCONTEXT lpIMC; DWORD flags = 0; WCHAR wParam = 0; LPIMEPRIVATE myPrivate; - TRACE("(%p, %d, %p, %d, %p, %d):\n", hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen); + TRACE("(%p, %d, %p, %d):\n", hIMC, dwIndex, lpComp, dwCompLen); /* * Explanation: @@ -957,9 +956,6 @@ BOOL WINAPI ImeSetCompositionString(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, DW * TODO: set the Cocoa window's marked text string and tell text input context */ - if (lpRead && dwReadLen) - FIXME("Reading string unimplemented\n"); - lpIMC = LockRealIMC(hIMC); if (lpIMC == NULL) @@ -985,8 +981,8 @@ BOOL WINAPI ImeSetCompositionString(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, DW ImmDestroyIMCC(lpIMC->hCompStr); lpIMC->hCompStr = newCompStr; - wParam = ((const WCHAR*)lpComp)[0]; - flags |= GCS_COMPCLAUSE | GCS_COMPATTR | GCS_DELTASTART; + wParam = ((const WCHAR*)lpComp)[0]; + flags |= GCS_COMPCLAUSE | GCS_COMPATTR | GCS_DELTASTART; } else { @@ -994,6 +990,16 @@ BOOL WINAPI ImeSetCompositionString(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, DW ImmDestroyIMCC(lpIMC->hCompStr); lpIMC->hCompStr = newCompStr; } + + if (cursor_valid) + { + LPCOMPOSITIONSTRING compstr; + compstr = ImmLockIMCC(lpIMC->hCompStr); + compstr->dwCursorPos = cursor_pos; + ImmUnlockIMCC(lpIMC->hCompStr); + flags |= GCS_CURSORPOS; + } + } GenerateIMEMessage(hIMC, WM_IME_COMPOSITION, wParam, flags); @@ -1003,44 +1009,23 @@ BOOL WINAPI ImeSetCompositionString(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, DW return TRUE; } -DWORD WINAPI ImeGetImeMenuItems(HIMC hIMC, DWORD dwFlags, DWORD dwType, LPIMEMENUITEMINFOW lpImeParentMenu, - LPIMEMENUITEMINFOW lpImeMenu, DWORD dwSize) -{ - FIXME("(%p, %x %x %p %p %x): stub\n", hIMC, dwFlags, dwType, lpImeParentMenu, lpImeMenu, dwSize); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -static void IME_SetCursorPos(void* hIMC, DWORD pos) +BOOL WINAPI ImeSetCompositionString(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, DWORD dwCompLen, + LPCVOID lpRead, DWORD dwReadLen) { - LPINPUTCONTEXT lpIMC; - LPCOMPOSITIONSTRING compstr; - - if (!hSelectedFrom) - return; - - lpIMC = LockRealIMC(hIMC); - if (!lpIMC) - return; + TRACE("(%p, %d, %p, %d, %p, %d):\n", hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen); - compstr = ImmLockIMCC(lpIMC->hCompStr); - if (!compstr) - { - UnlockRealIMC(hIMC); - return; - } + if (lpRead && dwReadLen) + FIXME("Reading string unimplemented\n"); - compstr->dwCursorPos = pos; - ImmUnlockIMCC(lpIMC->hCompStr); - UnlockRealIMC(hIMC); - GenerateIMEMessage(FROM_MACDRV, WM_IME_COMPOSITION, pos, GCS_CURSORPOS); - return; + return IME_SetCompositionString(hIMC, dwIndex, lpComp, dwCompLen, 0, FALSE); } - -static void IME_SetCompositionString(void* hIMC, LPCVOID lpComp, DWORD dwCompLen) +DWORD WINAPI ImeGetImeMenuItems(HIMC hIMC, DWORD dwFlags, DWORD dwType, LPIMEMENUITEMINFOW lpImeParentMenu, + LPIMEMENUITEMINFOW lpImeMenu, DWORD dwSize) { - ImeSetCompositionString(hIMC, SCS_SETSTR, lpComp, dwCompLen, NULL, 0); + FIXME("(%p, %x %x %p %p %x): stub\n", hIMC, dwFlags, dwType, lpImeParentMenu, lpImeMenu, dwSize); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } static void IME_NotifyComplete(void* hIMC) @@ -1437,23 +1422,6 @@ void IME_RegisterClasses(HINSTANCE hImeInst) WM_MSIME_DOCUMENTFEED = RegisterWindowMessageA("MSIMEDocumentFeed"); } - -/*********************************************************************** - * macdrv_im_set_cursor_pos - */ -void macdrv_im_set_cursor_pos(const macdrv_event *event) -{ - HWND hwnd = macdrv_get_window_hwnd(event->window); - void *himc = event->im_set_cursor_pos.data; - - TRACE("win %p/%p himc %p pos %u\n", hwnd, event->window, himc, event->im_set_cursor_pos.pos); - - if (!himc) himc = RealIMC(FROM_MACDRV); - - IME_SetCursorPos(himc, event->im_set_cursor_pos.pos); -} - - /*********************************************************************** * macdrv_im_set_text */ @@ -1481,7 +1449,8 @@ void macdrv_im_set_text(const macdrv_event *event) } if (himc) - IME_SetCompositionString(himc, chars, length * sizeof(*chars)); + IME_SetCompositionString(himc, SCS_SETSTR, chars, length * sizeof(*chars), + event->im_set_text.cursor_pos, !event->im_set_text.complete); else { INPUT input; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 1010ded..8e0b0f8 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -202,7 +202,6 @@ extern void IME_RegisterClasses(HINSTANCE hImeInst) DECLSPEC_HIDDEN; extern BOOL macdrv_process_text_input(UINT vkey, UINT scan, UINT repeat, const BYTE *key_state, void *himc) DECLSPEC_HIDDEN; -extern void macdrv_im_set_cursor_pos(const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_im_set_text(const macdrv_event *event) DECLSPEC_HIDDEN; extern BOOL query_ime_char_rect(macdrv_query* query) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index e7e2c4c..96a9592 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -165,7 +165,6 @@ enum { APP_DEACTIVATED, APP_QUIT_REQUESTED, DISPLAYS_CHANGED, - IM_SET_CURSOR_POS, IM_SET_TEXT, KEY_PRESS, KEY_RELEASE, @@ -208,11 +207,8 @@ typedef struct macdrv_event { } displays_changed; struct { void *data; - unsigned int pos; - } im_set_cursor_pos; - struct { - void *data; CFStringRef text; /* new text or NULL if just completing existing text */ + unsigned int cursor_pos; unsigned int complete; /* is completing text? */ } im_set_text; struct {

1 0

Francois Gouget : wined3d: Add a trailing '\n' to a shader_addline() call.
by Alexandre Julliard 30 May '13

30 May '13

Module: wine Branch: master Commit: 49dbf2464fdcb478f7fb593de2baec91a9d5bb45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49dbf2464fdcb478f7fb593de… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 30 19:08:31 2013 +0200 wined3d: Add a trailing '\n' to a shader_addline() call. --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8316e83..fb96463 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4977,7 +4977,7 @@ static GLhandleARB shader_glsl_generate_ffp_vertex_shader(struct wined3d_shader_ shader_addline(buffer, "r = reflect(normalize(ec_pos.xyz), normal);\n"); shader_addline(buffer, "m = 2.0 * length(vec3(r.x, r.y, r.z + 1.0));\n"); shader_addline(buffer, "gl_TexCoord[%u] = gl_TextureMatrix[%u]" - " * vec4(r.x / m + 0.5, r.y / m + 0.5, 0.0, 1.0);", i, i); + " * vec4(r.x / m + 0.5, r.y / m + 0.5, 0.0, 1.0);\n", i, i); break; default:

1 0

Dmitry Timoshkov : ole32: Add a couple more defaulthandler tests.
by Alexandre Julliard 30 May '13

30 May '13

Module: wine Branch: master Commit: 748c3ea9c9b3ddf9baceccc190e366f10b4349f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=748c3ea9c9b3ddf9baceccc19… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 30 17:30:12 2013 +0900 ole32: Add a couple more defaulthandler tests. --- dlls/ole32/tests/defaulthandler.c | 28 +++++++++++++++++++++++++--- 1 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/defaulthandler.c b/dlls/ole32/tests/defaulthandler.c index 0196e51..67fc5e8 100644 --- a/dlls/ole32/tests/defaulthandler.c +++ b/dlls/ole32/tests/defaulthandler.c @@ -171,7 +171,7 @@ static ULONG WINAPI test_class_Release(IUnknown *iface) return 1; } -static IUnknownVtbl test_class_vtbl = { +static const IUnknownVtbl test_class_vtbl = { test_class_QueryInterface, test_class_AddRef, test_class_Release, @@ -231,7 +231,7 @@ static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) return E_NOTIMPL; } -static IClassFactoryVtbl ClassFactoryVtbl = { +static const IClassFactoryVtbl ClassFactoryVtbl = { ClassFactory_QueryInterface, ClassFactory_AddRef, ClassFactory_Release, @@ -247,6 +247,8 @@ static void test_default_handler_run(void) IUnknown *unk; IRunnableObject *ro; + IOleObject *oleobj; + IPersistStorage *persist; DWORD class_reg; HRESULT hres; @@ -281,6 +283,14 @@ static void test_default_handler_run(void) hres = OleCreateDefaultHandler(&test_server_clsid, NULL, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "OleCreateDefaultHandler failed: %x\n", hres); + hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); + ok(hres == S_OK, "QueryInterface(IID_IOleObject) failed: %x\n", hres); + + hres = IOleObject_QueryInterface(oleobj, &IID_IPersistStorage, (void**)&persist); + ok(hres == S_OK, "QueryInterface(IID_IPersistStorage) failed: %x\n", hres); + IPersistStorage_Release(persist); + IOleObject_Release(oleobj); + hres = IUnknown_QueryInterface(unk, &IID_IRunnableObject, (void**)&ro); ok(hres == S_OK, "QueryInterface(IRunnableObject) failed: %x\n", hres); IUnknown_Release(unk); @@ -288,11 +298,23 @@ static void test_default_handler_run(void) SET_EXPECT(CF_QueryInterface_ClassFactory); SET_EXPECT(CF_CreateInstance); hres = IRunnableObject_Run(ro, NULL); - todo_wine ok(hres == S_OK, "Run failed: %x\n", hres); +todo_wine + ok(hres == S_OK, "Run failed: %x\n", hres); CHECK_CALLED(CF_QueryInterface_ClassFactory); CHECK_CALLED(CF_CreateInstance); IRunnableObject_Release(ro); + SET_EXPECT(CF_QueryInterface_ClassFactory); + SET_EXPECT(CF_CreateInstance); + hres = CoCreateInstance(&test_server_clsid, NULL, CLSCTX_LOCAL_SERVER, + &IID_IOleObject, (void**)&oleobj); +todo_wine + ok(hres == REGDB_E_CLASSNOTREG, "expected REGDB_E_CLASSNOTREG, got %x\n", hres); +todo_wine + CHECK_NOT_CALLED(CF_QueryInterface_ClassFactory); +todo_wine + CHECK_NOT_CALLED(CF_CreateInstance); + SET_EXPECT(CF_QueryInterface_IMarshal); CoRevokeClassObject(class_reg); todo_wine CHECK_CALLED(CF_QueryInterface_IMarshal);

1 0

Matěj Laitl : gdi32: More specific error messages in osmesa opengl initialization.
by Alexandre Julliard 30 May '13

30 May '13

Module: wine Branch: master Commit: 84c07af48ec940aec111e4d7105be951281b76f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84c07af48ec940aec111e4d71… Author: Matěj Laitl <matej(a)laitl.cz> Date: Wed May 29 17:33:22 2013 +0200 gdi32: More specific error messages in osmesa opengl initialization. --- dlls/gdi32/dibdrv/opengl.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dibdrv/opengl.c b/dlls/gdi32/dibdrv/opengl.c index 778fb0b..67cab00 100644 --- a/dlls/gdi32/dibdrv/opengl.c +++ b/dlls/gdi32/dibdrv/opengl.c @@ -115,15 +115,15 @@ static BOOL init_opengl(void) for (i = 0; i < sizeof(opengl_func_names)/sizeof(opengl_func_names[0]); i++) { - if (!(((void **)&opengl_funcs.gl)[i] = wine_dlsym( osmesa_handle, opengl_func_names[i], NULL, 0 ))) + if (!(((void **)&opengl_funcs.gl)[i] = wine_dlsym( osmesa_handle, opengl_func_names[i], buffer, sizeof(buffer) ))) { - ERR( "%s not found in %s, disabling.\n", opengl_func_names[i], SONAME_LIBOSMESA ); + ERR( "%s not found in %s (%s), disabling.\n", opengl_func_names[i], SONAME_LIBOSMESA, buffer ); goto failed; } } -#define LOAD_FUNCPTR(f) do if (!(p##f = (void *)wine_dlsym( osmesa_handle, #f, NULL, 0 ))) \ +#define LOAD_FUNCPTR(f) do if (!(p##f = (void *)wine_dlsym( osmesa_handle, #f, buffer, sizeof(buffer) ))) \ { \ - ERR( "%s not found in %s, disabling.\n", #f, SONAME_LIBOSMESA ); \ + ERR( "%s not found in %s (%s), disabling.\n", #f, SONAME_LIBOSMESA, buffer ); \ goto failed; \ } while(0)

1 0

Fabian Müntefering : dwrite: Added missing JUSTIFIED text alignment mode.
by Alexandre Julliard 30 May '13

30 May '13

Module: wine Branch: master Commit: 5d0b201059fdd6d5425dd07fed27dd7e9164efe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d0b201059fdd6d5425dd07fe… Author: Fabian Müntefering <Cookiezzz97(a)gmx.de> Date: Wed May 29 16:27:56 2013 +0200 dwrite: Added missing JUSTIFIED text alignment mode. --- include/dwrite.idl | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/dwrite.idl b/include/dwrite.idl index 98d55c3..a8bac59 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -157,7 +157,8 @@ typedef enum DWRITE_TEXT_ALIGNMENT { DWRITE_TEXT_ALIGNMENT_LEADING, DWRITE_TEXT_ALIGNMENT_TRAILING, - DWRITE_TEXT_ALIGNMENT_CENTER + DWRITE_TEXT_ALIGNMENT_CENTER, + DWRITE_TEXT_ALIGNMENT_JUSTIFIED } DWRITE_TEXT_ALIGNMENT; typedef enum DWRITE_PARAGRAPH_ALIGNMENT

1 0

Alistair Leslie-Hughes : oledb32: Pass the correct value to SafeArrayPutElement.
by Alexandre Julliard 30 May '13

30 May '13

Module: wine Branch: master Commit: 805abf6d89656db0e4af632fa3e2ac05cf4547dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=805abf6d89656db0e4af632fa… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 30 14:24:01 2013 +1000 oledb32: Pass the correct value to SafeArrayPutElement. --- dlls/oledb32/convert.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 4ec687c..e68078b 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -960,7 +960,7 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, psa = SafeArrayCreate(VT_UI1,1,rgsabound); for(i =0; i < src_len; i++,p++) { - hr = SafeArrayPutElement(psa, &i, &p); + hr = SafeArrayPutElement(psa, &i, p); if(FAILED(hr)) { SafeArrayDestroy (psa); return hr;

1 0

Alistair Leslie-Hughes : oledb32: DBTYPE_BYTES-> DBTYPE_VARIANT only uses the source length.
by Alexandre Julliard 30 May '13

30 May '13

Module: wine Branch: master Commit: 5faa69d3e3b07feb1e21342f17866bdfd0a84980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5faa69d3e3b07feb1e21342f1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 30 12:16:13 2013 +1000 oledb32: DBTYPE_BYTES->DBTYPE_VARIANT only uses the source length. --- dlls/oledb32/convert.c | 7 ++----- dlls/oledb32/tests/convert.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index ad97363..4ec687c 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -950,18 +950,15 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, case DBTYPE_BYTES: { LONG i; - LONG size; SAFEARRAY *psa = NULL; SAFEARRAYBOUND rgsabound[1]; unsigned char *p = src; - size = min(src_len, dst_max_len); - rgsabound[0].lLbound = 0; - rgsabound[0].cElements = size; + rgsabound[0].cElements = src_len; psa = SafeArrayCreate(VT_UI1,1,rgsabound); - for(i =0; i < size; i++,p++) + for(i =0; i < src_len; i++,p++) { hr = SafeArrayPutElement(psa, &i, &p); if(FAILED(hr)) { diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index aacacfa..5c6694f 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2716,11 +2716,51 @@ static void test_converttovar(void) ok(S(cy2).Lo == S(cy).Lo && S(cy2).Hi == S(cy).Hi, "got %d,%d\n", S(cy2).Lo, S(cy2).Hi); dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_VARIANT, sizeof(byte_src), &dst_len, &byte_src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(V_VT(&dst) == (VT_ARRAY|VT_UI1), "got %d\n", V_VT(&dst)); + if(V_VT(&dst) == (VT_ARRAY|VT_UI1)) + { + LONG l; + + hr = SafeArrayGetUBound(V_ARRAY(&dst), 1, &l); + ok(hr == S_OK, "got %08x\n", hr); + ok(l == 4, "got %d\n", l); /* 5 elements */ + } + VariantClear(&dst); + + dst_len = 0x1234; hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_VARIANT, 0, &dst_len, &byte_src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == sizeof(dst), "got %ld\n", dst_len); ok(V_VT(&dst) == (VT_ARRAY|VT_UI1), "got %d\n", V_VT(&dst)); + if(V_VT(&dst) == (VT_ARRAY|VT_UI1)) + { + LONG l; + + hr = SafeArrayGetUBound(V_ARRAY(&dst), 1, &l); + ok(hr == S_OK, "got %08x\n", hr); + ok(l == -1, "got %d\n", l); /* 0 elements */ + } + VariantClear(&dst); + + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_VARIANT, 2, &dst_len, &byte_src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(V_VT(&dst) == (VT_ARRAY|VT_UI1), "got %d\n", V_VT(&dst)); + if(V_VT(&dst) == (VT_ARRAY|VT_UI1)) + { + LONG l; + + hr = SafeArrayGetUBound(V_ARRAY(&dst), 1, &l); + ok(hr == S_OK, "got %08x\n", hr); + ok(l == 1, "got %d\n", l); /* 2 elements */ + } VariantClear(&dst); dst_len = 0x1234;

1 0

Alistair Leslie-Hughes : oledb32: Implement DataConvert DBTYPE_VARIANT-> DBTYPE_BYTES.
by Alexandre Julliard 30 May '13

30 May '13

Module: wine Branch: master Commit: 471bdafa3bc69cbd770cf0bd59dc2403acfc946e URL: http://source.winehq.org/git/wine.git/?a=commit;h=471bdafa3bc69cbd770cf0bd5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 24 10:18:16 2013 +1000 oledb32: Implement DataConvert DBTYPE_VARIANT->DBTYPE_BYTES. --- dlls/oledb32/convert.c | 43 ++++++++++++++++++++++++++++++++++++++++++ dlls/oledb32/tests/convert.c | 25 ++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index a784897..ad97363 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -995,6 +995,49 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, memcpy(d, src, min(src_len, dst_max_len)); return S_OK; + case DBTYPE_VARIANT: + { + if(V_VT((VARIANT*)src) == VT_NULL) + { + *dst_status = DBSTATUS_S_ISNULL; + *dst_len = 0; + return S_OK; + } + else + { + switch(V_VT((VARIANT*)src)) + { + case VT_UI1 | VT_ARRAY: + { + LONG l; + BYTE *data = NULL; + + hr = SafeArrayGetUBound(V_ARRAY((VARIANT*)src), 1, &l); + if(FAILED(hr)) + return hr; + + hr = SafeArrayAccessData(V_ARRAY((VARIANT*)src), (VOID**)&data); + if(FAILED(hr)) + { + ERR("SafeArrayAccessData Failed = 0x%08x\n", hr); + return hr; + } + + *dst_len = l+1; + *dst_status = DBSTATUS_S_OK; + memcpy(d, data, *dst_len); + + SafeArrayUnaccessData(V_ARRAY((VARIANT*)src)); + return S_OK; + } + break; + default: + FIXME("Unimplemented variant type %d -> BYTES\n", V_VT((VARIANT*)src)); + return E_NOTIMPL; + } + } + } + break; default: FIXME("Unimplemented conversion %04x -> DBTYPE_BYTES\n", src_type); return E_NOTIMPL; } break; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index b6bf4be..aacacfa 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2500,8 +2500,12 @@ static void test_converttobytes(void) DBLENGTH dst_len; HRESULT hr; BYTE byte_src[] = {0, 1, 2, 4, 5}; + BYTE byte_dst[] = {0, 0, 0, 0, 0}; BYTE dst[10] = {0}; DBSTATUS dst_status; + VARIANT v; + SAFEARRAY *psa = NULL; + SAFEARRAYBOUND rgsabound[1]; dst_len = 0; hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_BYTES, sizeof(byte_src), &dst_len, byte_src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); @@ -2516,6 +2520,27 @@ static void test_converttobytes(void) ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); ok(dst_len == sizeof(byte_src), "got %ld\n", dst_len); ok(!memcmp(byte_src, dst, 2 ), "bytes differ\n"); + + V_VT(&v) = VT_NULL; + dst_len = 0; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_BYTES, sizeof(v), &dst_len, &v, &dst, 2, 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_ISNULL, "got %08x\n", dst_status); + ok(dst_len == 0, "got %ld\n", dst_len); + + dst_len = 0; + rgsabound[0].lLbound = 0; + rgsabound[0].cElements = 4; + psa = SafeArrayCreate(VT_UI1,1,rgsabound); + + V_VT(&v) = VT_ARRAY|VT_UI1; + V_ARRAY(&v) = psa; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_BYTES, sizeof(v), &dst_len, &v, &dst, 10, 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 4, "%ld\n", dst_len); + ok(!memcmp(byte_dst, dst, dst_len), "bytes differ\n"); + VariantClear(&v); + } static void test_converttobytesbyref(void)

1 0

Alistair Leslie-Hughes : oledb32: Implement GetConversionSize, DBTYPE_VARIANT(VT_ARRAY|VT_UI1)->DBTYPE_BYTES.
by Alexandre Julliard 30 May '13

30 May '13

Module: wine Branch: master Commit: 40fcf6675284dbf757cbf105dcbda6ffede08281 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40fcf6675284dbf757cbf105d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 30 10:06:11 2013 +1000 oledb32: Implement GetConversionSize, DBTYPE_VARIANT(VT_ARRAY|VT_UI1)->DBTYPE_BYTES. --- dlls/oledb32/convert.c | 19 ++++++++++++++++++- dlls/oledb32/tests/convert.c | 15 +++++++++++++++ 2 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index ef2019c..a784897 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -1364,7 +1364,24 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, if(V_VT((VARIANT*)src) == VT_BSTR) *dst_len = (SysStringLen(V_BSTR((VARIANT*)src))) / sizeof(WCHAR); else - WARN("DBTYPE_VARIANT(%d)->DBTYPE_BYTES unimplemented\n", V_VT((VARIANT*)src)); + { + switch(V_VT((VARIANT*)src)) + { + case VT_UI1 | VT_ARRAY: + { + LONG l; + + hr = SafeArrayGetUBound(V_ARRAY((VARIANT*)src), 1, &l); + if(FAILED(hr)) + return hr; + *dst_len = l+1; + + break; + } + default: + WARN("DBTYPE_VARIANT(%d)->DBTYPE_BYTES unimplemented\n", V_VT((VARIANT*)src)); + } + } break; default: FIXME("unimplemented for %04x -> DBTYPE_BYTES\n", src_type); diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 49d8be0..b6bf4be 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2382,6 +2382,8 @@ static void test_getconversionsize(void) static WCHAR strW[] = {'t','e','s','t',0}; static char strTest[] = "test"; VARIANT var; + SAFEARRAY *psa = NULL; + SAFEARRAYBOUND rgsabound[1]; /* same way as CanConvert fails here */ dst_len = 0; @@ -2478,6 +2480,19 @@ static void test_getconversionsize(void) hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_BYTES, &src_len, &dst_len, &var); ok(hr == S_OK, "got 0x%08x\n", hr); VariantClear(&var); + + dst_len = 0; + src_len = 20; + rgsabound[0].lLbound = 0; + rgsabound[0].cElements = 1802; + psa = SafeArrayCreate(VT_UI1,1,rgsabound); + + V_VT(&var) = VT_ARRAY|VT_UI1; + V_ARRAY(&var) = psa; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_BYTES, &src_len, &dst_len, &var); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 1802, "%ld\n", dst_len); + VariantClear(&var); } static void test_converttobytes(void)

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 May 2013