June 2015 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Don' t use depth textures without ARB_depth_texture.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: 733d4b5ecc2e5e5e7098f2f4b92b7c245ed3fc6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=733d4b5ecc2e5e5e7098f2f4b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 9 09:28:09 2015 +0200 wined3d: Don't use depth textures without ARB_depth_texture. --- dlls/wined3d/utils.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 687d3d7..62158a0 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2121,6 +2121,16 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win if ((format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_SRGB_WRITE) && !srgb_write) format_clear_flag(format, WINED3DFMT_FLAG_SRGB_WRITE); + + if (!gl_info->supported[ARB_DEPTH_TEXTURE] + && format_texture_info[i].flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + { + format->flags[WINED3D_GL_RES_TYPE_TEX_1D] &= ~WINED3DFMT_FLAG_TEXTURE; + format->flags[WINED3D_GL_RES_TYPE_TEX_2D] &= ~WINED3DFMT_FLAG_TEXTURE; + format->flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + format->flags[WINED3D_GL_RES_TYPE_TEX_CUBE] &= ~WINED3DFMT_FLAG_TEXTURE; + format->flags[WINED3D_GL_RES_TYPE_TEX_RECT] &= ~WINED3DFMT_FLAG_TEXTURE; + } } /* Texture conversion stuff */

1 0

Stefan Dösinger : wined3d: Downgrade the framebuffer attachment FIXMEs to WARNs.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: 985c061ad3c14241e702930aa254202d831a559d URL: http://source.winehq.org/git/wine.git/?a=commit;h=985c061ad3c14241e702930aa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 9 09:28:10 2015 +0200 wined3d: Downgrade the framebuffer attachment FIXMEs to WARNs. --- dlls/wined3d/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 62158a0..44ba7ad 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1608,7 +1608,7 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined { if (format->flags[type] & WINED3DFMT_FLAG_RENDERTARGET) { - FIXME("Format %s with rendertarget flag is not supported as FBO color attachment (type %u)," + WARN("Format %s with rendertarget flag is not supported as FBO color attachment (type %u)," " and no fallback specified.\n", debug_d3dformat(format->id), type); format->flags[type] &= ~WINED3DFMT_FLAG_RENDERTARGET; } @@ -1642,7 +1642,7 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined } else { - FIXME("Format %s rtInternal format is not supported as FBO %s attachment, type %u.\n", + WARN("Format %s rtInternal format is not supported as FBO %s attachment, type %u.\n", debug_d3dformat(format->id), type_string, type); format->flags[type] &= ~WINED3DFMT_FLAG_RENDERTARGET; }

1 0

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8Address GetComponentByIndex.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: 4f15cc4d1a41e81bcb146908fc04b4f6dd9ffa11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f15cc4d1a41e81bcb146908f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Nov 27 15:57:44 2014 +1100 dpnet: Implement IDirectPlay8Address GetComponentByIndex. --- dlls/dpnet/address.c | 66 +++++++++++++++++++++++++++++++++++++++++++--- dlls/dpnet/tests/address.c | 37 ++++++++++++++++++++------ 2 files changed, 92 insertions(+), 11 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 7e10136..7a33f8a 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -405,9 +405,69 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_GetComponentByIndex(IDirectPlay8Ad const DWORD dwComponentID, WCHAR *pwszName, DWORD *pdwNameLen, void *pvBuffer, DWORD *pdwBufferSize, DWORD *pdwDataType) { - IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); - TRACE("(%p): stub\n", This); - return DPN_OK; + IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); + struct component *entry; + int namesize; + + TRACE("(%p)->(%u %p %p %p %p %p)\n", This, dwComponentID, pwszName, pdwNameLen, pvBuffer, pdwBufferSize, pdwDataType); + + if(!pdwNameLen || !pdwBufferSize || !pdwDataType) + { + WARN("Invalid buffer (%p, %p, %p)\n", pdwNameLen, pdwBufferSize, pdwDataType); + return DPNERR_INVALIDPOINTER; + } + + if(dwComponentID > This->comp_count) + { + WARN("dwComponentID out of range\n"); + return DPNERR_DOESNOTEXIST; + } + + entry = This->components[dwComponentID]; + + namesize = strlenW(entry->name); + if(*pdwBufferSize < entry->size || *pdwNameLen < namesize) + { + WARN("Buffer too small\n"); + + *pdwNameLen = namesize + 1; + *pdwBufferSize = entry->size; + *pdwDataType = entry->type; + return DPNERR_BUFFERTOOSMALL; + } + + if(!pwszName || !pvBuffer) + { + WARN("Invalid buffer (%p, %p)\n", pwszName, pvBuffer); + return DPNERR_INVALIDPOINTER; + } + + lstrcpyW(pwszName, entry->name); + + *pdwNameLen = namesize + 1; + *pdwBufferSize = entry->size; + *pdwDataType = entry->type; + + switch (entry->type) + { + case DPNA_DATATYPE_DWORD: + *(DWORD*)pvBuffer = entry->data.value; + break; + case DPNA_DATATYPE_GUID: + *(GUID*)pvBuffer = entry->data.guid; + break; + case DPNA_DATATYPE_STRING: + memcpy(pvBuffer, entry->data.string, entry->size); + break; + case DPNA_DATATYPE_STRING_ANSI: + memcpy(pvBuffer, entry->data.ansi, entry->size); + break; + case DPNA_DATATYPE_BINARY: + memcpy(pvBuffer, entry->data.binary, entry->size); + break; + } + + return S_OK; } static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address *iface, diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index 077f99e..ee589f5 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -87,6 +87,7 @@ static void address_addcomponents(void) DWORD bufflen = 0; DWORD port = 8888; WCHAR buffer[256]; + WCHAR *name = NULL; /* We can add any Component to the Address interface not just the predefined ones. */ hr = IDirectPlay8Address_AddComponent(localaddr, UNKNOWN, &IID_Random, sizeof(GUID), DPNA_DATATYPE_GUID); @@ -175,25 +176,45 @@ static void address_addcomponents(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDirectPlay8Address_GetComponentByIndex(localaddr, 100, NULL, &namelen, NULL, &bufflen, &type); - todo_wine ok(hr == DPNERR_DOESNOTEXIST, "got 0x%08x\n", hr); + ok(hr == DPNERR_DOESNOTEXIST, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetComponentByIndex(localaddr, 1, NULL, &namelen, NULL, &bufflen, NULL); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); + + bufflen = 100; + namelen = 0; + hr = IDirectPlay8Address_GetComponentByIndex(localaddr, 1, name, &namelen, buffer, &bufflen, &type); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + + namelen = 100; + hr = IDirectPlay8Address_GetComponentByIndex(localaddr, 1, NULL, &namelen, NULL, &bufflen, &type); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); hr = IDirectPlay8Address_GetComponentByIndex(localaddr, 100, NULL, NULL, NULL, &bufflen, &type); - todo_wine ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); hr = IDirectPlay8Address_GetComponentByIndex(localaddr, 100, NULL, &namelen, NULL, NULL, &type); - todo_wine ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); + + bufflen = 0; + namelen = 0; + type = 0; + hr = IDirectPlay8Address_GetComponentByIndex(localaddr, 0, NULL, &namelen, NULL, &bufflen, &type); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + ok(namelen == 8, "namelen expected 8 got %d\n", namelen); + ok(bufflen == 16, "bufflen expected 16 got %d\n", bufflen); + ok(type == DPNA_DATATYPE_GUID, "type expected DPNA_DATATYPE_GUID got %d\n", type); trace("GetNumComponents=%d\n", components); for(i=0; i < components; i++) { - WCHAR *name; void *buffer; bufflen = 0; namelen = 0; hr = IDirectPlay8Address_GetComponentByIndex(localaddr, i, NULL, &namelen, NULL, &bufflen, &type); - todo_wine ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); name = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, namelen * sizeof(WCHAR)); buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen); @@ -258,14 +279,14 @@ static void address_setsp(void) ok(components == 1, "components=%d\n", components); hr = IDirectPlay8Address_GetComponentByIndex(localaddr, 0, NULL, &namelen, NULL, &bufflen, &type); - todo_wine ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); name = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, namelen * sizeof(WCHAR)); hr = IDirectPlay8Address_GetComponentByIndex(localaddr, 0, name, &namelen, (void*)&guid, &bufflen, &type); ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(type == DPNA_DATATYPE_GUID, "wrong datatype: %d\n", type); - todo_wine ok(IsEqualGUID(&guid, &CLSID_DP8SP_TCPIP), "wrong guid\n"); + ok(type == DPNA_DATATYPE_GUID, "wrong datatype: %d\n", type); + ok(IsEqualGUID(&guid, &CLSID_DP8SP_TCPIP), "wrong guid\n"); HeapFree(GetProcessHeap(), 0, name);

1 0

Piotr Caban : msvcp90: Fix off by one issue in basic_string::rfind.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: a0e8d62a8ebd24e4ae474c262ddbc7d1a42f0e80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0e8d62a8ebd24e4ae474c262… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 9 13:49:54 2015 +0200 msvcp90: Fix off by one issue in basic_string::rfind. --- dlls/msvcp60/string.c | 8 ++++---- dlls/msvcp90/string.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 229c3ca..76a0e02 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -989,8 +989,8 @@ MSVCP_size_t __thiscall MSVCP_basic_string_char_rfind_cstr_substr( if(len > this->size) return MSVCP_basic_string_char_npos; - if(pos > this->size-len+1) - pos = this->size-len+1; + if(pos > this->size-len) + pos = this->size-len; end = this->ptr; for(p=end+pos; p>=end; p--) { if(*p==*find && !MSVCP_char_traits_char_compare(p, find, len)) @@ -2512,8 +2512,8 @@ MSVCP_size_t __thiscall MSVCP_basic_string_wchar_rfind_cstr_substr( if(len > this->size) return MSVCP_basic_string_wchar_npos; - if(pos > this->size-len+1) - pos = this->size-len+1; + if(pos > this->size-len) + pos = this->size-len; end = this->ptr; for(p=end+pos; p>=end; p--) { if(*p==*find && !MSVCP_char_traits_wchar_compare(p, find, len)) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 3afb375..413e5ff 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1542,8 +1542,8 @@ MSVCP_size_t __thiscall MSVCP_basic_string_char_rfind_cstr_substr( if(len > this->size) return MSVCP_basic_string_char_npos; - if(pos > this->size-len+1) - pos = this->size-len+1; + if(pos > this->size-len) + pos = this->size-len; end = basic_string_char_const_ptr(this); for(p=end+pos; p>=end; p--) { if(*p==*find && !MSVCP_char_traits_char_compare(p, find, len)) @@ -3392,8 +3392,8 @@ MSVCP_size_t __thiscall MSVCP_basic_string_wchar_rfind_cstr_substr( if(len > this->size) return MSVCP_basic_string_wchar_npos; - if(pos > this->size-len+1) - pos = this->size-len+1; + if(pos > this->size-len) + pos = this->size-len; end = basic_string_wchar_const_ptr(this); for(p=end+pos; p>=end; p--) { if(*p==*find && !MSVCP_char_traits_wchar_compare(p, find, len))

1 0

Huw Davies : mmdevapi/tests: Link against advapi32.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: 42cbc05e59d32228f4edd171ca66e4cbe5645d1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=42cbc05e59d32228f4edd171c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 9 13:57:07 2015 +0100 mmdevapi/tests: Link against advapi32. --- dlls/mmdevapi/tests/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mmdevapi/tests/Makefile.in b/dlls/mmdevapi/tests/Makefile.in index 00c8aaf..0f17ea31 100644 --- a/dlls/mmdevapi/tests/Makefile.in +++ b/dlls/mmdevapi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mmdevapi.dll -IMPORTS = ole32 version user32 +IMPORTS = ole32 version user32 advapi32 C_SRCS = \ capture.c \

1 0

Huw Davies : riched20: Append a final \par when writing the whole buffer.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: 17f273360afc7bf4a3f7f4effe942404560f9fff URL: http://source.winehq.org/git/wine.git/?a=commit;h=17f273360afc7bf4a3f7f4eff… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 8 14:53:46 2015 +0100 riched20: Append a final \par when writing the whole buffer. --- dlls/riched20/editor.c | 2 +- dlls/riched20/tests/editor.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- dlls/riched20/writer.c | 5 ++++- 3 files changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 38861fd..3ce6c91 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1708,7 +1708,7 @@ ME_StreamInRTFString(ME_TextEditor *editor, BOOL selection, char *string) data.pos = 0; es.dwCookie = (DWORD_PTR)&data; es.pfnCallback = ME_ReadFromRTFString; - ME_StreamIn(editor, SF_RTF | (selection ? SFF_SELECTION : 0), &es, FALSE); + ME_StreamIn(editor, SF_RTF | (selection ? SFF_SELECTION : 0), &es, TRUE); } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 09437ef..c3470d4 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3422,6 +3422,19 @@ static DWORD CALLBACK test_esCallback_written_1(DWORD_PTR dwCookie, return 0; } +static int count_pars(const char *buf) +{ + const char *p = buf; + int count = 0; + while ((p = strstr( p, "\\par" )) != NULL) + { + if (!isalpha( p[4] )) + count++; + p++; + } + return count; +} + static void test_EM_STREAMOUT(void) { HWND hwndRichEdit = new_richedit(NULL); @@ -3446,6 +3459,19 @@ static void test_EM_STREAMOUT(void) ok(strcmp(buf, TestItem1) == 0, "streamed text different, got %s\n", buf); + /* RTF mode writes the final end of para \r if it's part of the selection */ + p = buf; + SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF, (LPARAM)&es); + ok (count_pars(buf) == 1, "got %s\n", buf); + p = buf; + SendMessageA(hwndRichEdit, EM_SETSEL, 0, 12); + SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF|SFF_SELECTION, (LPARAM)&es); + ok (count_pars(buf) == 0, "got %s\n", buf); + p = buf; + SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); + SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF|SFF_SELECTION, (LPARAM)&es); + ok (count_pars(buf) == 1, "got %s\n", buf); + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)TestItem2); p = buf; es.dwCookie = (DWORD_PTR)&p; @@ -3458,6 +3484,20 @@ static void test_EM_STREAMOUT(void) ok(r == 14, "streamed text length is %d, expecting 14\n", r); ok(strcmp(buf, TestItem3) == 0, "streamed text different from, got %s\n", buf); + + /* And again RTF mode writes the final end of para \r if it's part of the selection */ + p = buf; + SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF, (LPARAM)&es); + ok (count_pars(buf) == 2, "got %s\n", buf); + p = buf; + SendMessageA(hwndRichEdit, EM_SETSEL, 0, 13); + SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF|SFF_SELECTION, (LPARAM)&es); + ok (count_pars(buf) == 1, "got %s\n", buf); + p = buf; + SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); + SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF|SFF_SELECTION, (LPARAM)&es); + ok (count_pars(buf) == 2, "got %s\n", buf); + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)TestItem3); p = buf; es.dwCookie = (DWORD_PTR)&p; @@ -4904,7 +4944,7 @@ static void test_WM_PASTE(void) SendMessageA(hwndRichEdit, WM_PASTE, 0, 0); SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); result = strcmp(buffer,"cut\r\n"); - todo_wine ok(result == 0, + ok(result == 0, "test paste: strcmp = %i, actual = '%s'\n", result, buffer); /* Simulates undo (Ctrl-Z) */ hold_key(VK_CONTROL); @@ -4919,7 +4959,7 @@ static void test_WM_PASTE(void) (MapVirtualKeyA('Y', MAPVK_VK_TO_VSC) << 16) | 1); SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); result = strcmp(buffer,"cut\r\n"); - todo_wine ok(result == 0, + ok(result == 0, "test paste: strcmp = %i, actual = '%s'\n", result, buffer); release_key(VK_CONTROL); diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 26a64a7..2c7386a 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -788,8 +788,11 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, ME_Cursor cursor = *start; ME_DisplayItem *prev_para = cursor.pPara; ME_Cursor endCur = cursor; + int actual_chars; - ME_MoveCursorChars(editor, &endCur, nChars); + actual_chars = ME_MoveCursorChars(editor, &endCur, nChars); + /* Include the final \r which MoveCursorChars will ignore. */ + if (actual_chars != nChars) endCur.nOffset++; if (!ME_StreamOutRTFHeader(pStream, dwFormat)) return FALSE;

1 0

Nikolay Sivov : oledb32: Fix instance leak on error path (Valgrind).
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: afa6cb528add488a416dbc0e7d80fd56fce52227 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afa6cb528add488a416dbc0e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 6 16:09:49 2015 +0300 oledb32: Fix instance leak on error path (Valgrind). --- dlls/oledb32/datainit.c | 21 +++++++++++++++++++-- dlls/oledb32/tests/database.c | 27 ++++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 3e1f509..f9db094 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -424,6 +424,7 @@ static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *o static const WCHAR providerW[] = {'P','r','o','v','i','d','e','r','=',0}; static const WCHAR msdasqlW[] = {'M','S','D','A','S','Q','L',0}; datainit *This = impl_from_IDataInitialize(iface); + BOOL datasource_created = FALSE; IDBProperties *dbprops; DBPROPSET *propset; WCHAR *prov = NULL; @@ -511,6 +512,8 @@ static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *o if (FAILED(hr) && IsEqualIID(riid, &IID_IDBInitialize)) hr = create_db_init(datasource); + + datasource_created = *datasource != NULL; } /* now set properties */ @@ -521,7 +524,12 @@ static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *o hr = IUnknown_QueryInterface(*datasource, &IID_IDBProperties, (void**)&dbprops); if (FAILED(hr)) { - WARN("provider doesn't support IDBProperties\n"); + ERR("provider doesn't support IDBProperties\n"); + if (datasource_created) + { + IUnknown_Release(*datasource); + *datasource = NULL; + } return hr; } @@ -557,7 +565,16 @@ static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *o hr = IDBProperties_SetProperties(dbprops, 1, propset); free_dbpropset(1, propset); - TRACE("provider ret 0x%08x\n", hr); + if (FAILED(hr)) + { + ERR("failed to set property, 0x%08x\n", hr); + if (datasource_created) + { + IUnknown_Release(*datasource); + *datasource = NULL; + } + break; + } } IDBProperties_Release(dbprops); diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 9e20fec..c1e440d 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -37,6 +37,14 @@ DEFINE_GUID(CSLID_MSDAER, 0xc8b522cf,0x5cf3,0x11ce,0xad,0xe5,0x00,0xaa,0x00,0x44 static WCHAR initstring_default[] = {'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';',0}; +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) +static void _expect_ref(IUnknown* obj, ULONG ref, int line) +{ + ULONG rc = IUnknown_AddRef(obj); + IUnknown_Release(obj); + ok_(__FILE__,line)(rc-1 == ref, "expected refcount %d, got %d\n", ref, rc-1); +} + static void test_GetDataSource(WCHAR *initstring) { IDataInitialize *datainit = NULL; @@ -48,12 +56,17 @@ static void test_GetDataSource(WCHAR *initstring) hr = CoCreateInstance(&CLSID_MSDAINITIALIZE, NULL, CLSCTX_INPROC_SERVER, &IID_IDataInitialize,(void**)&datainit); ok(hr == S_OK, "got %08x\n", hr); + EXPECT_REF(datainit, 1); + /* a failure to create data source here may indicate provider is simply not present */ hr = IDataInitialize_GetDataSource(datainit, NULL, CLSCTX_INPROC_SERVER, initstring, &IID_IDBInitialize, (IUnknown**)&dbinit); if(SUCCEEDED(hr)) { IDBProperties *props = NULL; + EXPECT_REF(datainit, 1); + EXPECT_REF(dbinit, 1); + hr = IDBInitialize_QueryInterface(dbinit, &IID_IDBProperties, (void**)&props); ok(hr == S_OK, "got %08x\n", hr); if(SUCCEEDED(hr)) @@ -62,6 +75,8 @@ static void test_GetDataSource(WCHAR *initstring) DBPROPINFOSET *pInfoset; OLECHAR *ary; + EXPECT_REF(dbinit, 2); + EXPECT_REF(props, 2); hr = IDBProperties_GetPropertyInfo(props, 0, NULL, &cnt, &pInfoset, &ary); todo_wine ok(hr == S_OK, "got %08x\n", hr); if(hr == S_OK) @@ -80,9 +95,11 @@ static void test_GetDataSource(WCHAR *initstring) IDBProperties_Release(props); } + EXPECT_REF(dbinit, 1); IDBInitialize_Release(dbinit); } + EXPECT_REF(datainit, 1); IDataInitialize_Release(datainit); } @@ -186,7 +203,7 @@ static void test_initializationstring(void) static const WCHAR initstring_sqloledb[] = {'P','r','o','v','i','d','e','r','=','S','Q','L','O','L','E','D','B','.','1',';', 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y', 0}; IDataInitialize *datainit = NULL; - IDBInitialize *dbinit = NULL; + IDBInitialize *dbinit; HRESULT hr; WCHAR *initstring = NULL; @@ -194,10 +211,16 @@ static void test_initializationstring(void) ok(hr == S_OK, "got %08x\n", hr); if(SUCCEEDED(hr)) { + EXPECT_REF(datainit, 1); + + dbinit = NULL; hr = IDataInitialize_GetDataSource(datainit, NULL, CLSCTX_INPROC_SERVER, initstring_default, &IID_IDBInitialize, (IUnknown**)&dbinit); if(SUCCEEDED(hr)) { + EXPECT_REF(datainit, 1); + EXPECT_REF(dbinit, 1); + hr = IDataInitialize_GetInitializationString(datainit, (IUnknown*)dbinit, 0, &initstring); ok(hr == S_OK, "got %08x\n", hr); if(hr == S_OK) @@ -210,6 +233,8 @@ static void test_initializationstring(void) IDBInitialize_Release(dbinit); } + else + ok(dbinit == NULL, "got %p\n", dbinit); IDataInitialize_Release(datainit); }

1 0

Nikolay Sivov : oledb32/tests: Added a test for GetDataSource() with created provider and custom properties.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: b95d31845407debb1b19ec58ce61a767b65041be URL: http://source.winehq.org/git/wine.git/?a=commit;h=b95d31845407debb1b19ec58c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 6 17:19:05 2015 +0300 oledb32/tests: Added a test for GetDataSource() with created provider and custom properties. --- dlls/oledb32/tests/database.c | 184 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 184 insertions(+) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index c1e440d..042be38 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -21,6 +21,7 @@ #define COBJMACROS #define CONST_VTABLE +#define DBINITCONSTANTS #include "windef.h" #include "winbase.h" @@ -29,6 +30,7 @@ #include "msdasc.h" #include "msdaguid.h" #include "initguid.h" +#include "oledb.h" #include "oledberr.h" #include "wine/test.h" @@ -103,6 +105,185 @@ static void test_GetDataSource(WCHAR *initstring) IDataInitialize_Release(datainit); } +/* IDBProperties stub */ +static HRESULT WINAPI dbprops_QI(IDBProperties *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IDBProperties) || IsEqualIID(riid, &IID_IUnknown)) { + *obj = iface; + IDBProperties_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI dbprops_AddRef(IDBProperties *iface) +{ + return 2; +} + +static ULONG WINAPI dbprops_Release(IDBProperties *iface) +{ + return 1; +} + +static HRESULT WINAPI dbprops_GetProperties(IDBProperties *iface, ULONG cPropertyIDSets, + const DBPROPIDSET rgPropertyIDSets[], ULONG *pcPropertySets, DBPROPSET **prgPropertySets) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI dbprops_GetPropertyInfo(IDBProperties *iface, ULONG cPropertyIDSets, + const DBPROPIDSET rgPropertyIDSets[], ULONG *pcPropertyInfoSets, DBPROPINFOSET **prgPropertyInfoSets, + OLECHAR **ppDescBuffer) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI dbprops_SetProperties(IDBProperties *iface, ULONG set_count, DBPROPSET propsets[]) +{ + ok(set_count == 1, "got %u\n", set_count); + + ok(IsEqualIID(&propsets->guidPropertySet, &DBPROPSET_DBINIT), "set guid %s\n", wine_dbgstr_guid(&propsets->guidPropertySet)); +todo_wine + ok(propsets->cProperties == 2, "got propcount %u\n", propsets->cProperties); + +if (propsets->cProperties == 2) { + ok(propsets->rgProperties[0].dwPropertyID == DBPROP_INIT_DATASOURCE, "got propid[0] %u\n", propsets->rgProperties[0].dwPropertyID); + ok(propsets->rgProperties[0].dwOptions == DBPROPOPTIONS_REQUIRED, "got options[0] %u\n", propsets->rgProperties[0].dwOptions); + ok(propsets->rgProperties[0].dwStatus == 0, "got status[0] %u\n", propsets->rgProperties[0].dwStatus); + ok(V_VT(&propsets->rgProperties[0].vValue) == VT_BSTR, "got vartype[0] %u\n", V_VT(&propsets->rgProperties[0].vValue)); + + ok(propsets->rgProperties[1].dwPropertyID == DBPROP_INIT_PROVIDERSTRING, "got propid[1] %u\n", propsets->rgProperties[1].dwPropertyID); + ok(propsets->rgProperties[1].dwOptions == DBPROPOPTIONS_REQUIRED, "got options[1] %u\n", propsets->rgProperties[1].dwOptions); + ok(propsets->rgProperties[1].dwStatus == 0, "got status[1] %u\n", propsets->rgProperties[1].dwStatus); + ok(V_VT(&propsets->rgProperties[1].vValue) == VT_BSTR, "got vartype[1] %u\n", V_VT(&propsets->rgProperties[1].vValue)); +} + return S_OK; +} + +static const IDBPropertiesVtbl dbpropsvtbl = { + dbprops_QI, + dbprops_AddRef, + dbprops_Release, + dbprops_GetProperties, + dbprops_GetPropertyInfo, + dbprops_SetProperties +}; + +static IDBProperties dbprops = { &dbpropsvtbl }; + +/* IPersist stub */ +static HRESULT WINAPI dbpersist_QI(IPersist *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IPersist) || IsEqualIID(riid, &IID_IUnknown)) { + *obj = iface; + IPersist_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI dbpersist_AddRef(IPersist *iface) +{ + return 2; +} + +static ULONG WINAPI dbpersist_Release(IPersist *iface) +{ + return 1; +} + +static HRESULT WINAPI dbpersist_GetClassID(IPersist *iface, CLSID *clsid) +{ + static const WCHAR msdasqlW[] = {'M','S','D','A','S','Q','L',0}; + return CLSIDFromProgID(msdasqlW, clsid); +} + +static const IPersistVtbl dbpersistvtbl = { + dbpersist_QI, + dbpersist_AddRef, + dbpersist_Release, + dbpersist_GetClassID +}; + +static IPersist dbpersist = { &dbpersistvtbl }; + +/* IDBInitialize stub */ +static HRESULT WINAPI dbinit_QI(IDBInitialize *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IDBInitialize) || IsEqualIID(riid, &IID_IUnknown)) { + *obj = iface; + IDBInitialize_AddRef(iface); + return S_OK; + } + else if (IsEqualIID(riid, &IID_IPersist)) { + *obj = &dbpersist; + return S_OK; + } + else if (IsEqualIID(riid, &IID_IDBProperties)) { + *obj = &dbprops; + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI dbinit_AddRef(IDBInitialize *iface) +{ + return 2; +} + +static ULONG WINAPI dbinit_Release(IDBInitialize *iface) +{ + return 1; +} + +static HRESULT WINAPI dbinit_Initialize(IDBInitialize *iface) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI dbinit_Uninitialize(IDBInitialize *iface) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IDBInitializeVtbl dbinitvtbl = { + dbinit_QI, + dbinit_AddRef, + dbinit_Release, + dbinit_Initialize, + dbinit_Uninitialize +}; + +static IDBInitialize dbinittest = { &dbinitvtbl }; + +static void test_GetDataSource2(WCHAR *initstring) +{ + IDataInitialize *datainit = NULL; + IDBInitialize *dbinit = NULL; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_MSDAINITIALIZE, NULL, CLSCTX_INPROC_SERVER, &IID_IDataInitialize,(void**)&datainit); + ok(hr == S_OK, "got %08x\n", hr); + + dbinit = &dbinittest; + hr = IDataInitialize_GetDataSource(datainit, NULL, CLSCTX_INPROC_SERVER, initstring, &IID_IDBInitialize, (IUnknown**)&dbinit); +todo_wine + ok(hr == S_OK, "got %08x\n", hr); + + IDataInitialize_Release(datainit); +} + static void test_database(void) { static WCHAR initstring_jet[] = {'P','r','o','v','i','d','e','r','=','M','i','c','r','o','s','o','f','t','.', @@ -110,6 +291,8 @@ static void test_database(void) 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';', 'P','e','r','s','i','s','t',' ','S','e','c','u','r','i','t','y',' ','I','n','f','o','=','F','a','l','s','e',';',0}; static WCHAR initstring_lower[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','d','u','m','m','y',';',0}; + static WCHAR customprop[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','d','u','m','m','y',';', + 'c','u','s','t','o','m','p','r','o','p','=','1','2','3','.','4',';',0}; IDataInitialize *datainit = NULL; HRESULT hr; @@ -125,6 +308,7 @@ static void test_database(void) test_GetDataSource(initstring_jet); test_GetDataSource(initstring_default); test_GetDataSource(initstring_lower); + test_GetDataSource2(customprop); } static void test_errorinfo(void)

1 0

Nikolay Sivov : kernel32/tests: Some tests for invalid classes in SetFileInformationByHandle().
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: 5742497a35691abc4fad7133265a0a69784679f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5742497a35691abc4fad71332… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 8 13:59:05 2015 +0300 kernel32/tests: Some tests for invalid classes in SetFileInformationByHandle(). --- dlls/kernel32/tests/file.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++ include/winbase.h | 31 ++++++++++++++++++++++++ 2 files changed, 90 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 9480bd4..384dd8d 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -55,6 +55,7 @@ static NTSTATUS (WINAPI *pNtCreateFile)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES PLARGE_INTEGER, ULONG, ULONG, ULONG, ULONG, PVOID, ULONG); static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)(LPCWSTR, PUNICODE_STRING, PWSTR*, CURDIR*); static NTSTATUS (WINAPI *pRtlAnsiStringToUnicodeString)(PUNICODE_STRING, PCANSI_STRING, BOOLEAN); +static BOOL (WINAPI *pSetFileInformationByHandle)(HANDLE, FILE_INFO_BY_HANDLE_CLASS, void*, DWORD); static const char filename[] = "testfile.xxx"; static const char sillytext[] = @@ -99,6 +100,7 @@ static void InitFunctionPointers(void) pCreateFile2 = (void *) GetProcAddress(hkernel32, "CreateFile2"); pGetFinalPathNameByHandleA = (void *) GetProcAddress(hkernel32, "GetFinalPathNameByHandleA"); pGetFinalPathNameByHandleW = (void *) GetProcAddress(hkernel32, "GetFinalPathNameByHandleW"); + pSetFileInformationByHandle = (void *) GetProcAddress(hkernel32, "SetFileInformationByHandle"); } static void test__hread( void ) @@ -4581,6 +4583,62 @@ static void test_GetFinalPathNameByHandleW(void) CloseHandle(file); } +static void test_SetFileInformationByHandle(void) +{ + FILE_ATTRIBUTE_TAG_INFO fileattrinfo = { 0 }; + FILE_REMOTE_PROTOCOL_INFO protinfo = { 0 }; + FILE_STANDARD_INFO stdinfo = { }; + FILE_COMPRESSION_INFO compressinfo; + char tempFileName[MAX_PATH]; + char tempPath[MAX_PATH]; + HANDLE file; + BOOL ret; + + if (!pSetFileInformationByHandle) + { + win_skip("SetFileInformationByHandle is not supported\n"); + return; + } + + ret = GetTempPathA(sizeof(tempPath), tempPath); + ok(ret, "GetTempPathA failed, got error %u.\n", GetLastError()); + + /* ensure the existence of a file in the temp folder */ + ret = GetTempFileNameA(tempPath, "abc", 0, tempFileName); + ok(ret, "GetTempFileNameA failed, got error %u.\n", GetLastError()); + + file = CreateFileA(tempFileName, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, FILE_FLAG_DELETE_ON_CLOSE, NULL); + ok(file != INVALID_HANDLE_VALUE, "failed to open the temp file, error %u.\n", GetLastError()); + + /* invalid classes */ + SetLastError(0xdeadbeef); + ret = pSetFileInformationByHandle(file, FileStandardInfo, &stdinfo, sizeof(stdinfo)); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); + + memset(&compressinfo, 0, sizeof(compressinfo)); + SetLastError(0xdeadbeef); + ret = pSetFileInformationByHandle(file, FileCompressionInfo, &compressinfo, sizeof(compressinfo)); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetFileInformationByHandle(file, FileAttributeTagInfo, &fileattrinfo, sizeof(fileattrinfo)); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); + + memset(&protinfo, 0, sizeof(protinfo)); + protinfo.StructureVersion = 1; + protinfo.StructureSize = sizeof(protinfo); + SetLastError(0xdeadbeef); + ret = pSetFileInformationByHandle(file, FileRemoteProtocolInfo, &protinfo, sizeof(protinfo)); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); + + CloseHandle(file); +} + START_TEST(file) { InitFunctionPointers(); @@ -4636,4 +4694,5 @@ START_TEST(file) test_file_access(); test_GetFinalPathNameByHandleA(); test_GetFinalPathNameByHandleW(); + test_SetFileInformationByHandle(); } diff --git a/include/winbase.h b/include/winbase.h index 4795d87..c558b21 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -874,6 +874,37 @@ typedef struct _FILE_RENAME_INFO { WCHAR FileName[1]; } FILE_RENAME_INFO, *PFILE_RENAME_INFO; +typedef struct _FILE_ATTRIBUTE_TAG_INFO { + DWORD FileAttributes; + DWORD ReparseTag; +} FILE_ATTRIBUTE_TAG_INFO, *PFILE_ATTRIBUTE_TAG_INFO; + +typedef struct _FILE_COMPRESSION_INFO { + LARGE_INTEGER CompressedFileSize; + WORD CompressionFormat; + UCHAR CompressionUnitShift; + UCHAR ChunkShift; + UCHAR ClusterShift; + UCHAR Reserved[3]; +} FILE_COMPRESSION_INFO, *PFILE_COMPRESSION_INFO; + +typedef struct _FILE_REMOTE_PROTOCOL_INFO { + USHORT StructureVersion; + USHORT StructureSize; + ULONG Protocol; + USHORT ProtocolMajorVersion; + USHORT ProtocolMinorVersion; + USHORT ProtocolRevision; + USHORT Reserved; + ULONG Flags; + struct { + ULONG Reserved[8]; + } GenericReserved; + struct { + ULONG Reserved[16]; + } ProtocolSpecificReserved; +} FILE_REMOTE_PROTOCOL_INFO, *PFILE_REMOTE_PROTOCOL_INFO; + #define PIPE_ACCESS_INBOUND 1 #define PIPE_ACCESS_OUTBOUND 2 #define PIPE_ACCESS_DUPLEX 3

1 0

Nikolay Sivov : gdiplus: Added GdipImageSetAbort stub.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: a5ab896abd27fcd367948b4716523c607997ff87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5ab896abd27fcd367948b471… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 8 16:44:40 2015 +0300 gdiplus: Added GdipImageSetAbort stub. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 9 +++++++++ include/gdiplusflat.h | 1 + include/gdiplustypes.h | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index cee3ea6..9701ee0 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -621,7 +621,7 @@ 621 stub GdipBitmapGetHistogram 622 stub GdipBitmapGetHistogramSize 623 stub GdipBitmapConvertFormat -624 stub GdipImageSetAbort +624 stdcall GdipImageSetAbort(ptr ptr) 625 stub GdipGraphicsSetAbort 626 stub GdipDrawImageFX 627 stdcall GdipConvertToEmfPlus(ptr ptr ptr long ptr ptr) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 86802a5..351c5b3 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -5235,3 +5235,12 @@ GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage *image, RotateFlipType type) return stat; } + +/***************************************************************************** + * GdipImageSetAbort [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipImageSetAbort(GpImage *image, GdiplusAbort *pabort) +{ + FIXME("(%p, %p): stub\n", image, pabort); + return NotImplemented; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 0753585..29119b4 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -421,6 +421,7 @@ GpStatus WINGDIPAPI GdipImageGetFrameDimensionsCount(GpImage*,UINT*); GpStatus WINGDIPAPI GdipImageGetFrameDimensionsList(GpImage*,GUID*,UINT); GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage*,RotateFlipType); GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage*,GDIPCONST GUID*,UINT); +GpStatus WINGDIPAPI GdipImageSetAbort(GpImage*,GdiplusAbort*); GpStatus WINGDIPAPI GdipLoadImageFromFile(GDIPCONST WCHAR*,GpImage**); GpStatus WINGDIPAPI GdipLoadImageFromFileICM(GDIPCONST WCHAR*,GpImage**); GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream*,GpImage**); diff --git a/include/gdiplustypes.h b/include/gdiplustypes.h index 2e46bb4..80d5955 100644 --- a/include/gdiplustypes.h +++ b/include/gdiplustypes.h @@ -54,6 +54,7 @@ extern "C" { typedef BOOL (CALLBACK * ImageAbort)(VOID *); typedef ImageAbort DrawImageAbort; typedef ImageAbort GetThumbnailImageAbort; +typedef struct GdiplusAbort GdiplusAbort; typedef BOOL (CALLBACK * EnumerateMetafileProc)(EmfPlusRecordType,UINT,UINT,const BYTE*,VOID*);

1 0