December 2012 - Wine-commits

Marcus Meissner : xmllite: Remove duplicated statement (Coverity).
by Alexandre Julliard 28 Dec '12

28 Dec '12

Module: wine Branch: master Commit: bc5d953f7e9112757838c82a3bc672784223e230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc5d953f7e9112757838c82a3… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Dec 27 20:03:58 2012 +0100 xmllite: Remove duplicated statement (Coverity). --- dlls/xmllite/reader.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 38c7a5e..c802550 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -845,7 +845,6 @@ static HRESULT reader_parse_misc(xmlreader *reader) break; if (FAILED(hr)) return hr; - cur = reader_get_cur(reader); } return hr;

1 0

Andrew Eikum : winmm: Reroute WAVE_MAPPER devices as the default device changes.
by Alexandre Julliard 28 Dec '12

28 Dec '12

Module: wine Branch: master Commit: 8f03c51e55ee2cdf8323b7712c6585a170fc025c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f03c51e55ee2cdf8323b7712… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Dec 27 14:05:55 2012 -0600 winmm: Reroute WAVE_MAPPER devices as the default device changes. --- dlls/winmm/waveform.c | 375 +++++++++++++++++++++++++++++++++---------------- 1 files changed, 252 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8f03c51e55ee2cdf8323b…

1 0

Jacek Caban : wininet: Properly handle output buffer size in InternetGetCookieW.
by Alexandre Julliard 28 Dec '12

28 Dec '12

Module: wine Branch: master Commit: 0c02e358418986c8139b787d098a1c41c8014254 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c02e358418986c8139b787d0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 27 17:54:19 2012 +0100 wininet: Properly handle output buffer size in InternetGetCookieW. --- dlls/wininet/cookie.c | 75 +++++++++++++++++++++++++--------------- dlls/wininet/http.c | 2 +- dlls/wininet/internet.h | 2 +- dlls/wininet/tests/internet.c | 7 ++++ 4 files changed, 56 insertions(+), 30 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 0dd93d9..cd761b1 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -31,6 +31,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <assert.h> #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -529,9 +530,10 @@ static void COOKIE_deleteDomain(cookie_domain *deadDomain) heap_free(deadDomain); } -BOOL get_cookie(const WCHAR *host, const WCHAR *path, WCHAR *cookie_data, DWORD *size) +DWORD get_cookie(const WCHAR *host, const WCHAR *path, WCHAR *cookie_data, DWORD *size) { - unsigned cnt = 0, len, domain_count = 0, cookie_count = 0; + unsigned cnt = 0, len, name_len, domain_count = 0, cookie_count = 0; + WCHAR *ptr = cookie_data; cookie_domain *domain; FILETIME tm; @@ -562,49 +564,62 @@ BOOL get_cookie(const WCHAR *host, const WCHAR *path, WCHAR *cookie_data, DWORD continue; } - if(!cookie_data) { /* return the size of the buffer required to lpdwSize */ - if (cookie_count) - cnt += 2; /* '; ' */ - cnt += strlenW(cookie_iter->lpCookieName); - if ((len = strlenW(cookie_iter->lpCookieData))) { - cnt += 1; /* = */ - cnt += len; - } - }else { - static const WCHAR szsc[] = { ';',' ',0 }; - static const WCHAR szname[] = { '%','s',0 }; - static const WCHAR szdata[] = { '=','%','s',0 }; - - if (cookie_count) cnt += snprintfW(cookie_data + cnt, *size - cnt, szsc); - cnt += snprintfW(cookie_data + cnt, *size - cnt, szname, cookie_iter->lpCookieName); - - if (cookie_iter->lpCookieData[0]) - cnt += snprintfW(cookie_data + cnt, *size - cnt, szdata, cookie_iter->lpCookieData); + if (cookie_count) + cnt += 2; /* '; ' */ + cnt += name_len = strlenW(cookie_iter->lpCookieName); + if ((len = strlenW(cookie_iter->lpCookieData))) { + cnt += 1; /* = */ + cnt += len; + } - TRACE("Cookie: %s\n", debugstr_w(cookie_data)); + if(ptr) { + if(*size > cnt) { + if(cookie_count) { + *ptr++ = ';'; + *ptr++ = ' '; + } + + memcpy(ptr, cookie_iter->lpCookieName, name_len*sizeof(WCHAR)); + ptr += name_len; + + if(len) { + *ptr++ = '='; + memcpy(ptr, cookie_iter->lpCookieData, len*sizeof(WCHAR)); + ptr += len; + } + + assert(cookie_data+cnt == ptr); + TRACE("Cookie: %s\n", debugstr_wn(cookie_data, cnt)); + }else { + /* Stop writing data, just compute the size */ + ptr = NULL; + } } + cookie_count++; } } LeaveCriticalSection(&cookie_cs); - if (!domain_count) { + if(ptr) + *ptr = 0; + + if (!cnt) { TRACE("no cookies found for %s\n", debugstr_w(host)); - SetLastError(ERROR_NO_MORE_ITEMS); - return FALSE; + return ERROR_NO_MORE_ITEMS; } - if(!cookie_data) { + if(!cookie_data || !ptr) { *size = (cnt + 1) * sizeof(WCHAR); TRACE("returning %u\n", *size); - return TRUE; + return cookie_data ? ERROR_INSUFFICIENT_BUFFER : ERROR_SUCCESS; } *size = cnt + 1; TRACE("Returning %u (from %u domains): %s\n", cnt, domain_count, debugstr_w(cookie_data)); - return cnt != 0; + return ERROR_SUCCESS; } /*********************************************************************** @@ -624,6 +639,7 @@ BOOL WINAPI InternetGetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, LPWSTR lpCookieData, LPDWORD lpdwSize) { WCHAR host[INTERNET_MAX_HOST_NAME_LENGTH], path[INTERNET_MAX_PATH_LENGTH]; + DWORD res; BOOL ret; TRACE("(%s, %s, %p, %p)\n", debugstr_w(lpszUrl),debugstr_w(lpszCookieName), lpCookieData, lpdwSize); @@ -641,7 +657,10 @@ BOOL WINAPI InternetGetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, return FALSE; } - return get_cookie(host, path, lpCookieData, lpdwSize); + res = get_cookie(host, path, lpCookieData, lpdwSize); + if(res != ERROR_SUCCESS) + SetLastError(res); + return res == ERROR_SUCCESS; } diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f890363..9e3e8e4 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4008,7 +4008,7 @@ static void HTTP_InsertCookies(http_request_t *request) if(!host) return; - if(!get_cookie(host->lpszValue, request->path, NULL, &cookie_size)) + if(get_cookie(host->lpszValue, request->path, NULL, &cookie_size) != ERROR_SUCCESS) return; size = sizeof(cookieW) + cookie_size * sizeof(WCHAR) + sizeof(szCrLf); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 10002d4..3d2bd35 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -517,7 +517,7 @@ DWORD HTTP_Connect(appinfo_t*,LPCWSTR, BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, struct sockaddr *psa, socklen_t *sa_len) DECLSPEC_HIDDEN; -BOOL get_cookie(const WCHAR*,const WCHAR*,WCHAR*,DWORD*) DECLSPEC_HIDDEN; +DWORD get_cookie(const WCHAR*,const WCHAR*,WCHAR*,DWORD*) DECLSPEC_HIDDEN; BOOL set_cookie(const WCHAR*,const WCHAR*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; void INTERNET_SetLastError(DWORD dwError) DECLSPEC_HIDDEN; diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 1b4ee46..8b0071c 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -426,6 +426,13 @@ static void test_complicated_cookie(void) ok(len == 19, "len = %u\n", len); ok(lstrlenW(wbuf) == 18, "strlenW(wbuf) = %u\n", lstrlenW(wbuf)); + len = 10; + memset(wbuf, 0xac, sizeof(wbuf)); + ret = InternetGetCookieW(testing_example_comW, NULL, wbuf, &len); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "InternetGetCookieW returned: %x(%u), expected ERROR_INSUFFICIENT_BUFFER\n", ret, GetLastError()); + ok(len == 38, "len = %u\n", len); + len = 1024; ret = InternetGetCookie("http://testing.example.com/foobar", NULL, buffer, &len); ok(ret == TRUE,"InternetGetCookie failed\n");

1 0

Jacek Caban : wininet: Properly handle output buffer size in InternetGetCookieA.
by Alexandre Julliard 28 Dec '12

28 Dec '12

Module: wine Branch: master Commit: f877fe9ba4562edb19752b456b7bd908fd5dc95d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f877fe9ba4562edb19752b456… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 27 17:54:29 2012 +0100 wininet: Properly handle output buffer size in InternetGetCookieA. --- dlls/wininet/cookie.c | 16 +++++++++++++--- dlls/wininet/tests/internet.c | 7 +++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index cd761b1..76f9ac5 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -678,7 +678,7 @@ BOOL WINAPI InternetGetCookieA(LPCSTR lpszUrl, LPCSTR lpszCookieName, LPSTR lpCookieData, LPDWORD lpdwSize) { WCHAR *url, *name; - DWORD len; + DWORD len, size; BOOL r; TRACE("(%s %s %p %p(%u))\n", debugstr_a(lpszUrl), debugstr_a(lpszCookieName), @@ -701,8 +701,18 @@ BOOL WINAPI InternetGetCookieA(LPCSTR lpszUrl, LPCSTR lpszCookieName, { r = InternetGetCookieW( url, name, szCookieData, &len ); - *lpdwSize = WideCharToMultiByte( CP_ACP, 0, szCookieData, len, - lpCookieData, lpCookieData ? *lpdwSize : 0, NULL, NULL ); + if(r) { + size = WideCharToMultiByte( CP_ACP, 0, szCookieData, len, NULL, 0, NULL, NULL); + if(lpCookieData) { + if(*lpdwSize >= size) { + WideCharToMultiByte( CP_ACP, 0, szCookieData, len, lpCookieData, *lpdwSize, NULL, NULL); + }else { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + r = FALSE; + } + } + *lpdwSize = size; + } heap_free( szCookieData ); } diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 8b0071c..c93c37a 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -414,6 +414,13 @@ static void test_complicated_cookie(void) ok(strstr(buffer,"M=N")==NULL,"M=N present\n"); ok(strstr(buffer,"O=P")==NULL,"O=P present\n"); + len = 10; + memset(buffer, 0xac, sizeof(buffer)); + ret = InternetGetCookie("http://testing.example.com", NULL, buffer, &len); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "InternetGetCookie returned: %x(%u), expected ERROR_INSUFFICIENT_BUFFER\n", ret, GetLastError()); + ok(len == 19, "len = %u\n", len); + len = 1024; ret = InternetGetCookieW(testing_example_comW, NULL, NULL, &len); ok(ret == TRUE,"InternetGetCookieW failed\n");

1 0

André Hentschel : netstat: Initial implementation.
by Alexandre Julliard 28 Dec '12

28 Dec '12

1 0

Nikolay Sivov : oledb32: Support data source properties from init string passed to GetDataSource().
by Alexandre Julliard 28 Dec '12

28 Dec '12

Module: wine Branch: master Commit: 3e8d4e76e5daf46ca3d2776a0aedcde51226c48d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e8d4e76e5daf46ca3d2776a0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 28 14:59:23 2012 +0400 oledb32: Support data source properties from init string passed to GetDataSource(). --- dlls/oledb32/datainit.c | 84 +++++++++++++++++++++++++++++++++++++++-- dlls/oledb32/tests/database.c | 2 +- 2 files changed, 81 insertions(+), 5 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 1316c0f..c710367 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -289,6 +289,32 @@ static void free_dbpropset(ULONG count, DBPROPSET *propset) CoTaskMemFree(propset); } +static HRESULT set_dbpropset(BSTR name, BSTR value, DBPROPSET **propset) +{ + static const WCHAR datasourceW[] = {'D','a','t','a',' ','S','o','u','r','c','e',0}; + + *propset = CoTaskMemAlloc(sizeof(DBPROPSET)); + (*propset)->rgProperties = CoTaskMemAlloc(sizeof(DBPROP)); + + if (!strcmpW(datasourceW, name)) + { + (*propset)->cProperties = 1; + (*propset)->guidPropertySet = DBPROPSET_DBINIT; + (*propset)->rgProperties[0].dwPropertyID = DBPROP_INIT_DATASOURCE; + (*propset)->rgProperties[0].dwOptions = DBPROPOPTIONS_REQUIRED; + (*propset)->rgProperties[0].dwStatus = 0; + memset(&(*propset)->rgProperties[0].colid, 0, sizeof(DBID)); + V_VT(&(*propset)->rgProperties[0].vValue) = VT_BSTR; + V_BSTR(&(*propset)->rgProperties[0].vValue) = SysAllocString(value); + return S_OK; + } + else + { + FIXME("unsupported property %s\n", debugstr_w(name)); + return E_FAIL; + } +} + /*** IDataInitialize methods ***/ static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *outer, DWORD clsctx, LPWSTR initstring, REFIID riid, IUnknown **datasource) @@ -296,11 +322,13 @@ 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); + IDBProperties *dbprops; + DBPROPSET *propset; WCHAR *prov = NULL; CLSID provclsid; HRESULT hr; - FIXME("(%p)->(%p 0x%x %s %s %p): semi-stub\n", This, outer, clsctx, debugstr_w(initstring), debugstr_guid(riid), datasource); + TRACE("(%p)->(%p 0x%x %s %s %p)\n", This, outer, clsctx, debugstr_w(initstring), debugstr_guid(riid), datasource); /* first get provider name */ provclsid = IID_NULL; @@ -340,9 +368,7 @@ static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *o /* check for provider mismatch if it was specified in init string */ if (*datasource && prov) { - IDBProperties *dbprops; DBPROPIDSET propidset; - DBPROPSET *propset; enum DBPROPENUM prop; CLSID initprov; ULONG count; @@ -385,7 +411,57 @@ static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *o hr = create_db_init((void**)datasource); } - /* FIXME: set properties from init string */ + /* now set properties */ + if (initstring) + { + static const WCHAR scolW[] = {';',0}; + static const WCHAR eqW[] = {'=',0}; + WCHAR *eq, *start; + + hr = IUnknown_QueryInterface(*datasource, &IID_IDBProperties, (void**)&dbprops); + if (FAILED(hr)) + { + WARN("provider doesn't support IDBProperties\n"); + return hr; + } + + start = initstring; + while ((eq = strstrW(start, eqW))) + { + static const WCHAR providerW[] = {'P','r','o','v','i','d','e','r',0}; + WCHAR *scol = strstrW(eq+1, scolW); + BSTR value, name; + + name = SysAllocStringLen(start, eq - start); + /* skip equal sign to get value */ + eq++; + value = SysAllocStringLen(eq, scol ? scol - eq : -1); + + /* skip semicolon if present */ + if (scol) scol++; + start = scol; + + if (!strcmpW(name, providerW)) + { + SysFreeString(name); + SysFreeString(value); + continue; + } + + TRACE("property (name=%s, value=%s)\n", debugstr_w(name), debugstr_w(value)); + + hr = set_dbpropset(name, value, &propset); + SysFreeString(name); + SysFreeString(value); + if (FAILED(hr)) return hr; + + hr = IDBProperties_SetProperties(dbprops, 1, propset); + free_dbpropset(1, propset); + TRACE("provider ret 0x%08x\n", hr); + } + + IDBProperties_Release(dbprops); + } return hr; } diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index ede1074..4d3694c 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -58,7 +58,7 @@ static void test_GetDataSource(WCHAR *initstring) 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','.', - 'J','e','t','.','O','L','E','D','B','.','4','.','0',';',0, + 'J','e','t','.','O','L','E','D','B','.','4','.','0',';', 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';',0}; static WCHAR initstring_default[] = {'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';',0}; IDataInitialize *datainit = NULL;

1 0

Alexandre Julliard : gdi32: Use the correct physdev for each driver call ( Coverity).
by Alexandre Julliard 28 Dec '12

28 Dec '12

Module: wine Branch: master Commit: 227fc26e63cd922a8a5db9c8d22ff73756e2d398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=227fc26e63cd922a8a5db9c8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 27 20:53:25 2012 +0100 gdi32: Use the correct physdev for each driver call (Coverity). --- dlls/gdi32/font.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index fe32167..c6a6946 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -312,7 +312,7 @@ static UINT get_default_smoothing( HKEY key ) static BOOL get_char_positions( DC *dc, const WCHAR *str, INT count, INT *dx, SIZE *size ) { TEXTMETRICW tm; - PHYSDEV dev = GET_DC_PHYSDEV( dc, pGetTextExtentExPoint ); + PHYSDEV dev; size->cx = size->cy = 0; if (!count) return TRUE; @@ -320,6 +320,7 @@ static BOOL get_char_positions( DC *dc, const WCHAR *str, INT count, INT *dx, SI dev = GET_DC_PHYSDEV( dc, pGetTextMetrics ); dev->funcs->pGetTextMetrics( dev, &tm ); + dev = GET_DC_PHYSDEV( dc, pGetTextExtentExPoint ); if (!dev->funcs->pGetTextExtentExPoint( dev, str, count, dx )) return FALSE; if (dc->breakExtra || dc->breakRem) @@ -349,7 +350,7 @@ static BOOL get_char_positions( DC *dc, const WCHAR *str, INT count, INT *dx, SI static BOOL get_char_positions_indices( DC *dc, const WORD *indices, INT count, INT *dx, SIZE *size ) { TEXTMETRICW tm; - PHYSDEV dev = GET_DC_PHYSDEV( dc, pGetTextExtentExPoint ); + PHYSDEV dev; size->cx = size->cy = 0; if (!count) return TRUE; @@ -357,6 +358,7 @@ static BOOL get_char_positions_indices( DC *dc, const WORD *indices, INT count, dev = GET_DC_PHYSDEV( dc, pGetTextMetrics ); dev->funcs->pGetTextMetrics( dev, &tm ); + dev = GET_DC_PHYSDEV( dc, pGetTextExtentExPoint ); if (!dev->funcs->pGetTextExtentExPointI( dev, indices, count, dx )) return FALSE; if (dc->breakExtra || dc->breakRem)

1 0

Christian Costa : d3dx9_36: Implement D3DXFileCreate with stubbed ID3DXFile interface + basic tests.
by Alexandre Julliard 27 Dec '12

27 Dec '12

Module: wine Branch: master Commit: 95433ccd3cb53602c472f317008b516fc0b11efc URL: http://source.winehq.org/git/wine.git/?a=commit;h=95433ccd3cb53602c472f3170… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Dec 25 10:42:01 2012 +0100 d3dx9_36: Implement D3DXFileCreate with stubbed ID3DXFile interface + basic tests. --- dlls/d3dx9_36/Makefile.in | 3 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/tests/Makefile.in | 3 +- dlls/d3dx9_36/tests/xfile.c | 35 +++++++++ dlls/d3dx9_36/xfile.c | 150 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 190 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index 7bd96a9..1875e9a 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in @@ -17,7 +17,8 @@ C_SRCS = \ surface.c \ texture.c \ util.c \ - volume.c + volume.c \ + xfile.c RC_SRCS = version.rc diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index ac1d208..a89ab29 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -121,7 +121,7 @@ @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stub D3DXDisassembleEffect(ptr long ptr) @ stub D3DXDisassembleShader(ptr long ptr ptr) -@ stub D3DXFileCreate(ptr) +@ stdcall D3DXFileCreate(ptr) @ stdcall D3DXFillCubeTexture(ptr ptr ptr) @ stub D3DXFillCubeTextureTX(ptr ptr) @ stdcall D3DXFillTexture(ptr ptr ptr) diff --git a/dlls/d3dx9_36/tests/Makefile.in b/dlls/d3dx9_36/tests/Makefile.in index 5384705..c99045c 100644 --- a/dlls/d3dx9_36/tests/Makefile.in +++ b/dlls/d3dx9_36/tests/Makefile.in @@ -11,7 +11,8 @@ C_SRCS = \ shader.c \ surface.c \ texture.c \ - volume.c + volume.c \ + xfile.c RC_SRCS = rsrc.rc diff --git a/dlls/d3dx9_36/tests/xfile.c b/dlls/d3dx9_36/tests/xfile.c new file mode 100644 index 0000000..5500949 --- /dev/null +++ b/dlls/d3dx9_36/tests/xfile.c @@ -0,0 +1,35 @@ +/* + * Copyright 2012 Christian Costa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/test.h" +#include "d3dx9.h" +#include "d3dx9xof.h" + +START_TEST(xfile) +{ + ID3DXFile *file; + HRESULT ret; + + ret = D3DXFileCreate(NULL); + ok(ret == E_POINTER, "D3DXCreateFile returned %#x, expected %#x\n", ret, E_POINTER); + + ret = D3DXFileCreate(&file); + ok(ret == S_OK, "D3DXCreateFile failed with %#x\n", ret); + + file->lpVtbl->Release(file); +} diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c new file mode 100644 index 0000000..ba04857 --- /dev/null +++ b/dlls/d3dx9_36/xfile.c @@ -0,0 +1,150 @@ +/* + * Copyright (C) 2012 Christian Costa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "wine/debug.h" + +#include "d3dx9.h" +#include "d3dx9xof.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + +typedef struct { + ID3DXFile ID3DXFile_iface; + LONG ref; +} ID3DXFileImpl; + + +static inline ID3DXFileImpl* impl_from_ID3DXFile(ID3DXFile *iface) +{ + return CONTAINING_RECORD(iface, ID3DXFileImpl, ID3DXFile_iface); +} + + +/*** IUnknown methods ***/ + +static HRESULT WINAPI ID3DXFileImpl_QueryInterface(ID3DXFile *iface, REFIID riid, void **ret_iface) +{ + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ret_iface); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_ID3DXFile)) + { + iface->lpVtbl->AddRef(iface); + *ret_iface = iface; + return S_OK; + } + + WARN("(%p)->(%s, %p), not found\n", iface, debugstr_guid(riid), ret_iface); + *ret_iface = NULL; + return E_NOINTERFACE; +} + + +static ULONG WINAPI ID3DXFileImpl_AddRef(ID3DXFile *iface) +{ + ID3DXFileImpl *This = impl_from_ID3DXFile(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(): new ref %d\n", iface, ref); + + return ref; +} + + +static ULONG WINAPI ID3DXFileImpl_Release(ID3DXFile *iface) +{ + ID3DXFileImpl *This = impl_from_ID3DXFile(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(): new ref %d\n", iface, ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + + +/*** ID3DXFile methods ***/ + +static HRESULT WINAPI ID3DXFileImpl_CreateEnumObject(ID3DXFile *iface, const void *source, D3DXF_FILELOADOPTIONS options, ID3DXFileEnumObject **enum_object) +{ + FIXME("(%p)->(%p, %x, %p): stub\n", iface, source, options, enum_object); + + return E_NOTIMPL; +} + + +static HRESULT WINAPI ID3DXFileImpl_CreateSaveObject(ID3DXFile *iface, const void *data, D3DXF_FILESAVEOPTIONS options, D3DXF_FILEFORMAT format, ID3DXFileSaveObject **save_object) +{ + FIXME("(%p)->(%p, %x, %u, %p): stub\n", iface, data, options, format, save_object); + + return E_NOTIMPL; +} + + +static HRESULT WINAPI ID3DXFileImpl_RegisterTemplates(ID3DXFile *iface, const void *data, SIZE_T size) +{ + FIXME("(%p)->(%p, %lu): stub\n", iface, data, size); + + return E_NOTIMPL; +} + + +static HRESULT WINAPI ID3DXFileImpl_RegisterEnumTemplates(ID3DXFile *iface, ID3DXFileEnumObject *enum_object) +{ + FIXME("(%p)->(%p): stub\n", iface, enum_object); + + return E_NOTIMPL; +} + + +static const ID3DXFileVtbl ID3DXFile_Vtbl = +{ + ID3DXFileImpl_QueryInterface, + ID3DXFileImpl_AddRef, + ID3DXFileImpl_Release, + ID3DXFileImpl_CreateEnumObject, + ID3DXFileImpl_CreateSaveObject, + ID3DXFileImpl_RegisterTemplates, + ID3DXFileImpl_RegisterEnumTemplates +}; + +HRESULT WINAPI D3DXFileCreate(ID3DXFile **d3dxfile) +{ + ID3DXFileImpl *object; + + TRACE("(%p)\n", d3dxfile); + + if (!d3dxfile) + return E_POINTER; + + *d3dxfile = NULL; + + object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->ID3DXFile_iface.lpVtbl = &ID3DXFile_Vtbl; + object->ref = 1; + + *d3dxfile = &object->ID3DXFile_iface; + + return S_OK; +}

1 0

Christian Costa : d3dx9_36: Check proper signature for DIB files.
by Alexandre Julliard 27 Dec '12

27 Dec '12

Module: wine Branch: master Commit: dabde6a04f6d02233bc5074a8eba613b2c4adc68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dabde6a04f6d02233bc5074a8… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Dec 25 10:42:29 2012 +0100 d3dx9_36: Check proper signature for DIB files. --- dlls/d3dx9_36/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index fa63e01..999c12e 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -732,7 +732,7 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D if (FAILED(hr)) { if ((datasize >= 2) && (!strncmp(data, "P3", 2) || !strncmp(data, "P6", 2))) FIXME("File type PPM is not supported yet\n"); - else if ((datasize >= 2) && !strncmp(data, "BM", 2)) + else if ((datasize >= 4) && (*(DWORD*)data == sizeof(BITMAPINFOHEADER))) FIXME("File type DIB is not supported yet\n"); else if ((datasize >= 10) && !strncmp(data, "#?RADIANCE", 10)) FIXME("File type HDR is not supported yet\n");

1 0

Nikolay Sivov : oledb32: Partial implementation of GetDataSource().
by Alexandre Julliard 27 Dec '12

27 Dec '12

Module: wine Branch: master Commit: ec4de1f9fe0f7dd4138c9d8a721515d40015aa75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec4de1f9fe0f7dd4138c9d8a7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 26 20:53:45 2012 +0400 oledb32: Partial implementation of GetDataSource(). --- dlls/oledb32/datainit.c | 130 +++++++++++++++++++++++++++++++++------- dlls/oledb32/tests/database.c | 42 +++++++++----- include/oledberr.h | 2 + 3 files changed, 137 insertions(+), 37 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 78a005d..1316c0f 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -273,21 +273,121 @@ static ULONG WINAPI datainit_Release(IDataInitialize *iface) return ref; } +static void free_dbpropset(ULONG count, DBPROPSET *propset) +{ + int i; + + for (i = 0; i < count; i++) + { + int p; + + for (p = 0; p < propset[i].cProperties; p++) + VariantClear(&propset[i].rgProperties[p].vValue); + + CoTaskMemFree(propset[i].rgProperties); + } + CoTaskMemFree(propset); +} + /*** IDataInitialize methods ***/ -static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *pUnkOuter, DWORD dwClsCtx, - LPWSTR pwszInitializationString, REFIID riid, IUnknown **ppDataSource) +static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *outer, DWORD clsctx, + LPWSTR initstring, REFIID riid, IUnknown **datasource) { + 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); + WCHAR *prov = NULL; + CLSID provclsid; + HRESULT hr; - FIXME("(%p)->(%p %d %s %s %p)\n", This, pUnkOuter, dwClsCtx, debugstr_w(pwszInitializationString), - debugstr_guid(riid), ppDataSource); + FIXME("(%p)->(%p 0x%x %s %s %p): semi-stub\n", This, outer, clsctx, debugstr_w(initstring), debugstr_guid(riid), datasource); - if(IsEqualIID(riid, &IID_IDBInitialize)) + /* first get provider name */ + provclsid = IID_NULL; + if (initstring && (prov = strstrW(initstring, providerW))) { - return create_db_init( (LPVOID*)ppDataSource); + WCHAR *start, *progid; + int len; + + prov += sizeof(providerW)/sizeof(WCHAR)-1; + start = prov; + while (*prov && *prov != ';') + ++prov; + TRACE("got provider %s\n", debugstr_wn(start, prov-start)); + + len = prov - start; + progid = CoTaskMemAlloc((len+1)*sizeof(WCHAR)); + if (!progid) return E_OUTOFMEMORY; + + memcpy(progid, start, len*sizeof(WCHAR)); + progid[len] = 0; + + hr = CLSIDFromProgID(progid, &provclsid); + CoTaskMemFree(progid); + if (FAILED(hr)) + { + ERR("provider %s not registered\n", debugstr_wn(start, prov-start)); + return hr; + } + } + else + { + hr = CLSIDFromProgID(msdasqlW, &provclsid); + if (FAILED(hr)) + ERR("ODBC provider for OLE DB not registered\n"); } - return E_NOTIMPL; + /* check for provider mismatch if it was specified in init string */ + if (*datasource && prov) + { + IDBProperties *dbprops; + DBPROPIDSET propidset; + DBPROPSET *propset; + enum DBPROPENUM prop; + CLSID initprov; + ULONG count; + + hr = IUnknown_QueryInterface(*datasource, &IID_IDBProperties, (void**)&dbprops); + if (FAILED(hr)) + { + WARN("provider doesn't support IDBProperties\n"); + return hr; + } + + prop = DBPROP_INIT_DATASOURCE; + propidset.rgPropertyIDs = &prop; + propidset.cPropertyIDs = 1; + propidset.guidPropertySet = DBPROPSET_DBINIT; + count = 0; + propset = NULL; + hr = IDBProperties_GetProperties(dbprops, 1, &propidset, &count, &propset); + IDBProperties_Release(dbprops); + if (FAILED(hr)) + { + WARN("GetProperties failed for datasource, 0x%08x\n", hr); + return hr; + } + + TRACE("initial data source provider %s\n", debugstr_w(V_BSTR(&propset->rgProperties[0].vValue))); + initprov = IID_NULL; + CLSIDFromProgID(V_BSTR(&propset->rgProperties[0].vValue), &initprov); + free_dbpropset(count, propset); + + if (!IsEqualIID(&provclsid, &initprov)) return DB_E_MISMATCHEDPROVIDER; + } + + if (!*datasource) + { + if (!IsEqualIID(&provclsid, &IID_NULL)) + hr = CoCreateInstance(&provclsid, outer, clsctx, riid, (void**)datasource); + + if (FAILED(hr) && IsEqualIID(riid, &IID_IDBInitialize)) + hr = create_db_init((void**)datasource); + } + + /* FIXME: set properties from init string */ + + return hr; } /* returns character length of string representation */ @@ -342,22 +442,6 @@ static WCHAR *get_propinfo_descr(DBPROP *prop, DBPROPINFOSET *propinfoset) return NULL; } -static void free_dbpropset(ULONG count, DBPROPSET *propset) -{ - int i; - - for (i = 0; i < count; i++) - { - int p; - - for (p = 0; p < propset[i].cProperties; p++) - VariantClear(&propset[i].rgProperties[p].vValue); - - CoTaskMemFree(propset[i].rgProperties); - } - CoTaskMemFree(propset); -} - static void free_dbpropinfoset(ULONG count, DBPROPINFOSET *propinfoset) { int i; diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index f093d17..ede1074 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -30,22 +30,17 @@ #include "wine/test.h" - -static void test_database(void) +static void test_GetDataSource(WCHAR *initstring) { - HRESULT hr; - IDBInitialize *dbinit = NULL; IDataInitialize *datainit = NULL; + IDBInitialize *dbinit = NULL; + HRESULT hr; hr = CoCreateInstance(&CLSID_MSDAINITIALIZE, NULL, CLSCTX_INPROC_SERVER, &IID_IDataInitialize,(void**)&datainit); - if(FAILED(hr)) - { - win_skip("Unable to load oledb library\n"); - return; - } - - hr = IDataInitialize_GetDataSource(datainit, NULL, CLSCTX_INPROC_SERVER, NULL, &IID_IDBInitialize, (IUnknown **)&dbinit); ok(hr == S_OK, "got %08x\n", hr); + + /* 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; @@ -53,16 +48,35 @@ static void test_database(void) hr = IDBInitialize_QueryInterface(dbinit, &IID_IDBProperties, (void**)&props); ok(hr == S_OK, "got %08x\n", hr); if(SUCCEEDED(hr)) - { IDBProperties_Release(props); - } - IDBInitialize_Release(dbinit); } 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','.', + 'J','e','t','.','O','L','E','D','B','.','4','.','0',';',0, + 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';',0}; + static WCHAR initstring_default[] = {'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';',0}; + IDataInitialize *datainit = NULL; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_MSDAINITIALIZE, NULL, CLSCTX_INPROC_SERVER, &IID_IDataInitialize,(void**)&datainit); + if (FAILED(hr)) + { + win_skip("Unable to load oledb library\n"); + return; + } + IDataInitialize_Release(datainit); + + test_GetDataSource(NULL); + test_GetDataSource(initstring_jet); + test_GetDataSource(initstring_default); +} + START_TEST(database) { OleInitialize(NULL); diff --git a/include/oledberr.h b/include/oledberr.h index 94db602..c2033b6 100644 --- a/include/oledberr.h +++ b/include/oledberr.h @@ -35,6 +35,8 @@ #define DB_E_DATAOVERFLOW 0x80040e57 +#define DB_E_MISMATCHEDPROVIDER 0x80040e75 + #define DB_S_ERRORSOCCURRED 0x00040eda #endif /* __WINE_OLEDBERR_H */

1 0