May 2013 - Wine-commits - list.winehq.org

Jacek Caban : jscript: Added RegExp.toString() implementation.
by Alexandre Julliard 27 May '13

27 May '13

Module: wine Branch: master Commit: f34722e772303c30c3ce0eac1d3ee2e445762809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f34722e772303c30c3ce0eac1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 27 13:57:07 2013 +0200 jscript: Added RegExp.toString() implementation. --- dlls/jscript/jsregexp.c | 46 ++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/regexp.js | 12 +++++++++++ 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index 0104f3e..d6602f4 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -333,8 +333,50 @@ static HRESULT RegExp_lastIndex(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, static HRESULT RegExp_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("\n"); - return E_NOTIMPL; + RegExpInstance *regexp; + unsigned len, f; + jsstr_t *ret; + WCHAR *ptr; + + TRACE("\n"); + + if(!is_vclass(jsthis, JSCLASS_REGEXP)) { + FIXME("Not a RegExp\n"); + return E_NOTIMPL; + } + + regexp = regexp_from_vdisp(jsthis); + + if(!r) + return S_OK; + + len = jsstr_length(regexp->str) + 2; + + f = regexp->jsregexp->flags; + if(f & REG_FOLD) + len++; + if(f & REG_GLOB) + len++; + if(f & REG_MULTILINE) + len++; + + ptr = jsstr_alloc_buf(len, &ret); + if(!ptr) + return E_OUTOFMEMORY; + + *ptr++ = '/'; + ptr += jsstr_flush(regexp->str, ptr); + *ptr++ = '/'; + + if(f & REG_FOLD) + *ptr++ = 'i'; + if(f & REG_GLOB) + *ptr++ = 'g'; + if(f & REG_MULTILINE) + *ptr++ = 'm'; + + *r = jsval_string(ret); + return S_OK; } static HRESULT create_match_array(script_ctx_t *ctx, jsstr_t *input_str, diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index 69aa6b7..25ec91e 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -648,4 +648,16 @@ ok(!("$10" in RegExp), "RegExp.$10 exists"); RegExp.$1 = "a"; ok(RegExp.$1 === "b", "RegExp.$1 = " + RegExp.$1); +ok(/abc/.toString() === "/abc/", "/abc/.toString() = " + /abc/.toString()); +ok(/\//.toString() === "/\\//", "/\//.toString() = " + /\//.toString()); +tmp = new RegExp("abc/"); +ok(tmp.toString() === "/abc//", "(new RegExp(\"abc/\")).toString() = " + tmp.toString()); +ok(/abc/g.toString() === "/abc/g", "/abc/g.toString() = " + /abc/g.toString()); +ok(/abc/i.toString() === "/abc/i", "/abc/i.toString() = " + /abc/i.toString()); +ok(/abc/ig.toString() === "/abc/ig", "/abc/ig.toString() = " + /abc/ig.toString()); +ok(/abc/mgi.toString() === "/abc/igm", "/abc/mgi.toString() = " + /abc/mgi.toString()); +tmp = new RegExp("abc/", "mgi"); +ok(tmp.toString() === "/abc//igm", "(new RegExp(\"abc/\")).toString() = " + tmp.toString()); +ok(/abc/.toString(1, false, "3") === "/abc/", "/abc/.toString(1, false, \"3\") = " + /abc/.toString()); + reportSuccess();

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMTEXTURE2.
by Alexandre Julliard 27 May '13

27 May '13

Module: wine Branch: master Commit: 41fe35583daa9e6793d93fde30b237b2601bb9e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41fe35583daa9e6793d93fde3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 27 09:22:52 2013 +0200 d3drm: Avoid LPDIRECT3DRMTEXTURE2. --- dlls/d3drm/d3drm.c | 22 +++++++++------------- include/d3drm.h | 5 +++-- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index fe728a8..75656a7 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -697,25 +697,21 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateUserVisual(IDirect3DRM2* iface, return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM2Impl_LoadTexture(IDirect3DRM2* iface, const char* filename, - LPDIRECT3DRMTEXTURE2* Texture) +static HRESULT WINAPI IDirect3DRM2Impl_LoadTexture(IDirect3DRM2 *iface, + const char *filename, IDirect3DRMTexture2 **texture) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - - FIXME("(%p/%p)->(%s,%p): stub\n", iface, This, filename, Texture); + FIXME("iface %p, filename %s, texture %p stub!\n", iface, debugstr_a(filename), texture); - return Direct3DRMTexture_create(&IID_IDirect3DRMTexture2, (IUnknown **)Texture); + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture2, (IUnknown **)texture); } -static HRESULT WINAPI IDirect3DRM2Impl_LoadTextureFromResource(IDirect3DRM2* iface, HMODULE hModule, - LPCSTR strName, LPCSTR strType, - LPDIRECT3DRMTEXTURE2* Texture) +static HRESULT WINAPI IDirect3DRM2Impl_LoadTextureFromResource(IDirect3DRM2 *iface, HMODULE module, + const char *resource_name, const char *resource_type, IDirect3DRMTexture2 **texture) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); + FIXME("iface %p, resource_name %s, resource_type %s, texture %p stub!\n", + iface, debugstr_a(resource_name), debugstr_a(resource_type), texture); - FIXME("(%p/%p)->(%p,%p,%p,%p): stub\n", iface, This, hModule, strName, strType, Texture); - - return Direct3DRMTexture_create(&IID_IDirect3DRMTexture2, (IUnknown **)Texture); + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture2, (IUnknown **)texture); } static HRESULT WINAPI IDirect3DRM2Impl_SetSearchPath(IDirect3DRM2* iface, LPCSTR path) diff --git a/include/d3drm.h b/include/d3drm.h index 44163fe..baae6aa 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -226,8 +226,9 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) D3DVALUE dx, D3DVALUE dy, D3DVALUE dz, D3DVALUE ux, D3DVALUE uy, D3DVALUE uz, D3DVALUE ou, D3DVALUE ov, D3DVALUE su, D3DVALUE sv, IDirect3DRMWrap **wrap) PURE; STDMETHOD(CreateUserVisual)(THIS_ D3DRMUSERVISUALCALLBACK, LPVOID pArg, LPDIRECT3DRMUSERVISUAL *) PURE; - STDMETHOD(LoadTexture)(THIS_ const char *, LPDIRECT3DRMTEXTURE2 *) PURE; - STDMETHOD(LoadTextureFromResource)(THIS_ HMODULE hModule, LPCSTR /* LPCTSTR */ strName, LPCSTR /* LPCTSTR */ strType, LPDIRECT3DRMTEXTURE2 *) PURE; + STDMETHOD(LoadTexture)(THIS_ const char *filename, IDirect3DRMTexture2 **texture) PURE; + STDMETHOD(LoadTextureFromResource)(THIS_ HMODULE module, const char *resource_name, + const char *resource_type, IDirect3DRMTexture2 **texture) PURE; STDMETHOD(SetSearchPath)(THIS_ LPCSTR) PURE; STDMETHOD(AddSearchPath)(THIS_ LPCSTR) PURE; STDMETHOD(GetSearchPath)(THIS_ DWORD *size_return, LPSTR path_return) PURE;

1 0

Joško Nikolić : po: Add Croatian language.
by Alexandre Julliard 27 May '13

27 May '13

Module: wine Branch: master Commit: 8e0a088890870e55c604f5d451e116fcb09bf417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e0a088890870e55c604f5d45… Author: Joško Nikolić <josko.nikolic(a)fer.hr> Date: Fri May 24 17:20:46 2013 +0000 po: Add Croatian language. --- configure | 1 + configure.ac | 1 + po/LINGUAS | 1 + po/hr.po |13922 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 13925 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e0a088890870e55c604f…

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 27 May '13

27 May '13

Module: wine Branch: master Commit: be968797d33d0fc40b2f2a14491566fff47e6fb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be968797d33d0fc40b2f2a144… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon May 27 22:47:47 2013 +0900 po: Update Korean translation. --- po/ko.po | 90 ++++++++++++++++++------------------------------------------- 1 files changed, 27 insertions(+), 63 deletions(-) diff --git a/po/ko.po b/po/ko.po index c7bd9ef..2485a4e 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-12-18 18:50+0900\n" +"PO-Revision-Date: 2013-04-15 10:56+0900\n" "Last-Translator: YunSong Hwang <hys545(a)dreamwiz.com>\n" "Language-Team: none\n" "Language: Korean\n" @@ -8257,16 +8257,12 @@ msgid "Don't install" msgstr "설치 안 함" #: urlmon.rc:40 -#, fuzzy -#| msgid "" -#| "When installed, ActiveX has full access to your computer.Do not click " -#| "install unless you have absolute trust in the above source." msgid "" "When installed, an ActiveX component has full access to your computer. Do " "not click install unless you have absolute trust in the above source." msgstr "" -"설치할 때,ActiveX는 당신의 컴퓨터에 완전한 접근권한을 가질 것입니다. 당신이" -"이 원본을 완전히 신뢰하지 않는다면 설치를 클릭하지 마십시오." +"설치할 때,ActiveX 구성요소는 당신의 컴퓨터에 완전한 접근권한을 가질 것입니" +"다. 당신이이 원본을 완전히 신뢰하지 않는다면 설치를 클릭하지 마십시오." #: urlmon.rc:48 msgid "Installation of component failed: %08x" @@ -10156,10 +10152,8 @@ msgid "Connection-specific DNS suffix" msgstr "연결에 지정된 DNS 접미사" #: ipconfig.rc:33 -#, fuzzy -#| msgid "IP address" msgid "IPv4 address" -msgstr "IP 주소" +msgstr "IPv4 주소" #: ipconfig.rc:34 msgid "Hostname" @@ -10202,10 +10196,8 @@ msgid "Default gateway" msgstr "기본 게이트웨이" #: ipconfig.rc:47 -#, fuzzy -#| msgid "IP address" msgid "IPv6 address" -msgstr "IP 주소" +msgstr "IPv6 주소" #: net.rc:27 msgid "" @@ -10343,7 +10335,7 @@ msgstr "활성화된 연결" #: netstat.rc:28 msgid "Proto" -msgstr "프로토콜" +msgstr "프로토" #: netstat.rc:29 msgid "Local Address" @@ -10358,124 +10350,96 @@ msgid "State" msgstr "상태" #: netstat.rc:32 -#, fuzzy -#| msgid "Interfaces" msgid "Interface Statistics" -msgstr "인터페이스" +msgstr "인터페이스 통계" #: netstat.rc:33 msgid "Sent" -msgstr "" +msgstr "보냄" #: netstat.rc:34 msgid "Received" -msgstr "" +msgstr "응답받음" #: netstat.rc:35 -#, fuzzy -#| msgid "bytes" msgid "Bytes" msgstr "바이트" #: netstat.rc:36 msgid "Unicast packets" -msgstr "" +msgstr "유니캐스트 패킷" #: netstat.rc:37 msgid "Non-unicast packets" -msgstr "" +msgstr "유니캐스트가 아닌 패킷" #: netstat.rc:38 -#, fuzzy -#| msgid "Disclaimer" msgid "Discards" -msgstr "거부" +msgstr "폐기" #: netstat.rc:39 -#, fuzzy -#| msgid "Error" msgid "Errors" msgstr "오류" #: netstat.rc:40 -#, fuzzy -#| msgid "Unknown port.\n" msgid "Unknown protocols" -msgstr "알 수 없는 포트.\n" +msgstr "알 수 없는 프로토콜" #: netstat.rc:41 msgid "TCP Statistics for IPv4" -msgstr "" +msgstr "IPv4의 TCP 상태" #: netstat.rc:42 -#, fuzzy -#| msgid "Active Connections" msgid "Active Opens" -msgstr "활성화된 연결" +msgstr "활성화된 열림" #: netstat.rc:43 msgid "Passive Opens" -msgstr "" +msgstr "수동적인 열림" #: netstat.rc:44 -#, fuzzy -#| msgid "Active Connections" msgid "Failed Connection Attempts" -msgstr "활성화된 연결" +msgstr "연결 시도 실패" #: netstat.rc:45 -#, fuzzy -#| msgid "Active Connections" msgid "Reset Connections" -msgstr "활성화된 연결" +msgstr "연결 재설정" #: netstat.rc:46 -#, fuzzy -#| msgid "Active Connections" msgid "Current Connections" -msgstr "활성화된 연결" +msgstr "현재 연결" #: netstat.rc:47 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Segments Received" -msgstr "세그멘트가 잠김.\n" +msgstr "세그멘트가 응답함" #: netstat.rc:48 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Segments Sent" -msgstr "세그멘트가 잠김.\n" +msgstr "세그멘트가 보내짐" #: netstat.rc:49 msgid "Segments Retransmitted" -msgstr "" +msgstr "세그멘트가 다시 보내짐" #: netstat.rc:50 msgid "UDP Statistics for IPv4" -msgstr "" +msgstr "IPv4의 UDP 상태" #: netstat.rc:51 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Datagrams Received" -msgstr "세그멘트가 잠김.\n" +msgstr "데이터그램을 받음" #: netstat.rc:52 -#, fuzzy -#| msgid "Local Port" msgid "No Ports" -msgstr "지역 포트" +msgstr "포트가 없음" #: netstat.rc:53 -#, fuzzy -#| msgid "Decoding Error" msgid "Receive Errors" -msgstr "디코딩 오류" +msgstr "받는 중에 오류 발생" #: netstat.rc:54 msgid "Datagrams Sent" -msgstr "" +msgstr "데이터그램을 보냄" #: notepad.rc:27 msgid "&New\tCtrl+N"

1 0

Marcus Meissner : d3dx9_36: Allocate the right size (Coverity).
by Alexandre Julliard 27 May '13

27 May '13

Module: wine Branch: master Commit: 64fb92ab380d8bfc90e390289e22bf39d54219ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=64fb92ab380d8bfc90e390289… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat May 25 09:04:37 2013 +0200 d3dx9_36: Allocate the right size (Coverity). --- dlls/d3dx9_36/surface.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index ed93eb4..1df0cf2 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1134,8 +1134,8 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(IDirect3DSurface9 *pDestSurface, hr = IWICPalette_GetColorCount(wic_palette, &nb_colors); if (SUCCEEDED(hr)) { - colors = HeapAlloc(GetProcessHeap(), 0, nb_colors * sizeof(colors)); - palette = HeapAlloc(GetProcessHeap(), 0, nb_colors * sizeof(palette)); + colors = HeapAlloc(GetProcessHeap(), 0, nb_colors * sizeof(colors[0])); + palette = HeapAlloc(GetProcessHeap(), 0, nb_colors * sizeof(palette[0])); if (!colors || !palette) hr = E_OUTOFMEMORY; }

1 0

Marcus Meissner : oledb32: Avoid leak in error path on safearray conversion (Coverity).
by Alexandre Julliard 27 May '13

27 May '13

Module: wine Branch: master Commit: 36fee7c2e5e9339256d5b1e7cad632af4863690c URL: http://source.winehq.org/git/wine.git/?a=commit;h=36fee7c2e5e9339256d5b1e7c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat May 25 09:25:19 2013 +0200 oledb32: Avoid leak in error path on safearray conversion (Coverity). --- dlls/oledb32/convert.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 0961464..a2fd0cb 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -957,8 +957,10 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, for(i =0; i < size; i++,p++) { hr = SafeArrayPutElement(psa, &i, &p); - if(FAILED(hr)) + if(FAILED(hr)) { + SafeArrayDestroy (psa); return hr; + } } V_VT(v) = VT_ARRAY|VT_UI1;

1 0

Marcus Meissner : wined3d: Remove now useless NULL check (Coverity).
by Alexandre Julliard 27 May '13

27 May '13

Module: wine Branch: master Commit: 589b48e495a929d2c0b5c9092f26b3a604f11126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=589b48e495a929d2c0b5c9092… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat May 25 09:40:54 2013 +0200 wined3d: Remove now useless NULL check (Coverity). --- dlls/wined3d/resource.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 0e0678d..3d50652 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -169,8 +169,7 @@ void resource_cleanup(struct wined3d_resource *resource) resource->allocatedMemory = 0; resource->heapMemory = 0; - if (resource->device) - device_resource_released(resource->device, resource); + device_resource_released(resource->device, resource); } void resource_unload(struct wined3d_resource *resource)

1 0

Nikolay Sivov : comctl32: Return previously set colors for PBM_SETBKCOLOR and PBM_SETBARCOLOR.
by Alexandre Julliard 27 May '13

27 May '13

Module: wine Branch: master Commit: 65a47e3df65159a34fc67f35d14958e9ad831069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65a47e3df65159a34fc67f35d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 25 20:12:12 2013 +0400 comctl32: Return previously set colors for PBM_SETBKCOLOR and PBM_SETBARCOLOR. --- dlls/comctl32/progress.c | 14 +++++++++++--- dlls/comctl32/tests/progress.c | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index aba5302..989c61e 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -544,7 +544,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, case WM_CREATE: { DWORD dwExStyle = GetWindowLongW (hwnd, GWL_EXSTYLE); - + theme = OpenThemeData (hwnd, themeClass); dwExStyle &= ~(WS_EX_CLIENTEDGE | WS_EX_WINDOWEDGE); @@ -690,17 +690,25 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, return infoPtr->CurVal; case PBM_SETBARCOLOR: + { + COLORREF clr = infoPtr->ColorBar; + infoPtr->ColorBar = (COLORREF)lParam; InvalidateRect(hwnd, NULL, TRUE); - return 0; + return clr; + } case PBM_GETBARCOLOR: return infoPtr->ColorBar; case PBM_SETBKCOLOR: + { + COLORREF clr = infoPtr->ColorBk; + infoPtr->ColorBk = (COLORREF)lParam; InvalidateRect(hwnd, NULL, TRUE); - return 0; + return clr; + } case PBM_GETBKCOLOR: return infoPtr->ColorBk; diff --git a/dlls/comctl32/tests/progress.c b/dlls/comctl32/tests/progress.c index 3083e8b..59a4b00 100644 --- a/dlls/comctl32/tests/progress.c +++ b/dlls/comctl32/tests/progress.c @@ -32,6 +32,11 @@ static HWND hProgressParentWnd, hProgressWnd; static const char progressTestClass[] = "ProgressBarTestClass"; +static HWND create_progress(DWORD style) +{ + return CreateWindowExA(0, PROGRESS_CLASSA, "", WS_VISIBLE | style, + 0, 0, 100, 20, NULL, NULL, GetModuleHandleA(NULL), 0); +} /* try to make sure pending X events have been processed before continuing */ static void flush_events(void) @@ -224,12 +229,40 @@ static void test_redraw(void) ok(erased, "Progress bar should have erased the background\n"); } +static void test_setcolors(void) +{ + HWND progress; + COLORREF clr; + + progress = create_progress(PBS_SMOOTH); + + clr = SendMessageA(progress, PBM_SETBARCOLOR, 0, 0); + ok(clr == CLR_DEFAULT, "got %x\n", clr); + + clr = SendMessageA(progress, PBM_SETBARCOLOR, 0, RGB(0, 255, 0)); + ok(clr == 0, "got %x\n", clr); + + clr = SendMessageA(progress, PBM_SETBARCOLOR, 0, CLR_DEFAULT); + ok(clr == RGB(0, 255, 0), "got %x\n", clr); + + clr = SendMessageA(progress, PBM_SETBKCOLOR, 0, 0); + ok(clr == CLR_DEFAULT, "got %x\n", clr); + + clr = SendMessageA(progress, PBM_SETBKCOLOR, 0, RGB(255, 0, 0)); + ok(clr == 0, "got %x\n", clr); + + clr = SendMessageA(progress, PBM_SETBKCOLOR, 0, CLR_DEFAULT); + ok(clr == RGB(255, 0, 0), "got %x\n", clr); + + DestroyWindow(progress); +} START_TEST(progress) { init(); test_redraw(); - + test_setcolors(); + cleanup(); }

1 0

Alistair Leslie-Hughes : oledb32: DataConvert Support NULL variant in, DBTYPE_VARIANT->DBTYPE_WSTR.
by Alexandre Julliard 27 May '13

27 May '13

Module: wine Branch: master Commit: a1baa22d470cb6fcf1ce8e803ff9854e1b6dd926 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1baa22d470cb6fcf1ce8e803… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 24 12:23:18 2013 +1000 oledb32: DataConvert Support NULL variant in, DBTYPE_VARIANT->DBTYPE_WSTR. --- dlls/oledb32/convert.c | 3 ++- dlls/oledb32/tests/convert.c | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index a2fd0cb..a33f933 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -787,7 +787,8 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, hr = IDataConvert_DataConvert(iface, src_type, DBTYPE_BSTR, src_len, &bstr_len, src, &b, sizeof(BSTR), src_status, dst_status, precision, scale, flags); - if(hr != S_OK) return hr; + if(hr != S_OK || *dst_status == DBSTATUS_S_ISNULL) + return hr; bstr_len = SysStringLen(b); *dst_len = bstr_len * sizeof(WCHAR); /* Doesn't include size for '\0' */ *dst_status = DBSTATUS_S_OK; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index fd69fed..88dc1d3 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -1017,6 +1017,7 @@ static void test_converttowstr(void) static const WCHAR hexunpacked_w[] = {'5','7','0','0','6','9','0','0','6','E','0','0','6','5','0','0','0','0','0','0', 0 }; static const WCHAR hexpacked_w[] = {'W','i','n','e', 0 }; BSTR b; + VARIANT v; memset(dst, 0xcc, sizeof(dst)); dst_len = 0x1234; @@ -1470,6 +1471,24 @@ static void test_converttowstr(void) ok(dst_len == 0, "got %ld\n", dst_len); ok(dst[0] == 0, "not null terminated\n"); ok(dst[1] == 0xcccc, "clobbered buffer\n"); + + b = SysAllocStringLen(NULL, 0); + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = b; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_WSTR, 0, &dst_len, &v, &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 == 0, "got %ld\n", dst_len); + ok(dst != NULL, "got %p\n", dst); + ok(dst != b, "got %p src %p\n", dst, b); + ok(!lstrcmpW(b, dst), "got %s\n", wine_dbgstr_w(dst)); + VariantClear(&v); + + V_VT(&v) = VT_NULL; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_WSTR, 0, &dst_len, &v, &dst, sizeof(dst), 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); } static void test_converttostr(void)

1 0

Alistair Leslie-Hughes : oledb32: Check for DBSTATUS_S_ISNULL first.
by Alexandre Julliard 27 May '13

27 May '13

Module: wine Branch: master Commit: 5b8a375ab92cde38d3f299f0ee3454949adb6504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b8a375ab92cde38d3f299f0e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 24 15:35:30 2013 +1000 oledb32: Check for DBSTATUS_S_ISNULL first. --- dlls/oledb32/convert.c | 10 +++++----- dlls/oledb32/tests/convert.c | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index a33f933..490685b 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -179,11 +179,6 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, *dst_status = DBSTATUS_E_BADACCESSOR; - if(IDataConvert_CanConvert(iface, src_type, dst_type) != S_OK) - { - return DB_E_UNSUPPORTEDCONVERSION; - } - if(src_status == DBSTATUS_S_ISNULL) { *dst_status = DBSTATUS_S_ISNULL; @@ -191,6 +186,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, return S_OK; } + if(IDataConvert_CanConvert(iface, src_type, dst_type) != S_OK) + { + return DB_E_UNSUPPORTEDCONVERSION; + } + if(dst == NULL && get_length(dst_type) != 0) { *dst_len = get_length(src_type); diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 88dc1d3..089b28c 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2714,6 +2714,21 @@ static void test_converttotimestamp(void) SysFreeString(bstr); } +static void test_converttoiunknown(void) +{ + HRESULT hr; + DBSTATUS dst_status; + DBLENGTH dst_len; + IUnknown *dst = NULL; + static WCHAR strW[] = {'t','e','s','t',0}; + + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_WSTR, DBTYPE_IUNKNOWN, sizeof(strW), &dst_len, strW, dst, sizeof(dst), DBSTATUS_S_ISNULL, &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); +} + START_TEST(convert) { HRESULT hr; @@ -2751,6 +2766,7 @@ START_TEST(convert) test_converttodbdate(); test_getconversionsize(); test_converttotimestamp(); + test_converttoiunknown(); IDataConvert_Release(convert);

1 0