December 2012 - Wine-Commits

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

Dec. 28, 2012

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

Marcus Meissner : usp10: Mark SHAPE_ApplyOpenTypePositions as hidden.
by Alexandre Julliard Dec. 28, 2012

Dec. 28, 2012

Module: wine Branch: master Commit: 02722c4d8e04280588046e9234e30ee3c98cd6a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02722c4d8e04280588046e923… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Dec 27 19:30:09 2012 +0100 usp10: Mark SHAPE_ApplyOpenTypePositions as hidden. --- dlls/usp10/usp10_internal.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index e92648c..272e2e0 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -223,7 +223,7 @@ INT BIDI_ReorderV2lLevel(int level, int *pIndexs, const BYTE* plevel, int cch, B INT BIDI_ReorderL2vLevel(int level, int *pIndexs, const BYTE* plevel, int cch, BOOL fReverse) DECLSPEC_HIDDEN; void SHAPE_ContextualShaping(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust) DECLSPEC_HIDDEN; void SHAPE_ApplyDefaultOpentypeFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, INT cChars, WORD *pwLogClust) DECLSPEC_HIDDEN; -void SHAPE_ApplyOpenTypePositions(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WORD* pwGlyphs, INT cGlyphs, int *piAdvance, GOFFSET *pGoffset ); +void SHAPE_ApplyOpenTypePositions(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WORD* pwGlyphs, INT cGlyphs, int *piAdvance, GOFFSET *pGoffset ) DECLSPEC_HIDDEN; HRESULT SHAPE_CheckFontForRequiredFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa) DECLSPEC_HIDDEN; void SHAPE_CharGlyphProp(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp) DECLSPEC_HIDDEN; INT SHAPE_does_GSUB_feature_apply_to_chars(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, const WCHAR *chars, INT write_dir, INT count, const char* feature) DECLSPEC_HIDDEN;

1 0

André Hentschel : netstat: Initial implementation.
by Alexandre Julliard Dec. 28, 2012

Dec. 28, 2012

1 0

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

Dec. 28, 2012

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

Marcus Meissner : winhttp: Do not free name too early (Coverity).
by Alexandre Julliard Dec. 28, 2012

Dec. 28, 2012

Module: wine Branch: master Commit: ab6369231fbfcb65967e7690a6b1ac7c2c928430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab6369231fbfcb65967e7690a… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Dec 27 19:43:27 2012 +0100 winhttp: Do not free name too early (Coverity). --- dlls/winhttp/session.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index c360a7e..d5aa153 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1247,7 +1247,6 @@ BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url ) strcpy( name, "wpad" ); strcat( name, p ); res = getaddrinfo( name, NULL, NULL, &ai ); - heap_free( name ); if (!res) { *url = build_wpad_url( name, ai ); @@ -1255,10 +1254,12 @@ BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url ) if (*url) { TRACE("returning %s\n", debugstr_w(*url)); + heap_free( name ); ret = TRUE; break; } } + heap_free( name ); p++; } heap_free( domain );

1 0

Marcus Meissner : oleaut32: Mark PropertyPageSiteVtbl static.
by Alexandre Julliard Dec. 28, 2012

Dec. 28, 2012

Module: wine Branch: master Commit: e0fa39b3e0f6d76be5025647db1226b7e30fad66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0fa39b3e0f6d76be5025647d… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Dec 27 19:31:06 2012 +0100 oleaut32: Mark PropertyPageSiteVtbl static. --- dlls/oleaut32/olepropframe.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/olepropframe.c b/dlls/oleaut32/olepropframe.c index 8111e6b..e566266 100644 --- a/dlls/oleaut32/olepropframe.c +++ b/dlls/oleaut32/olepropframe.c @@ -140,7 +140,7 @@ static HRESULT WINAPI PropertyPageSite_TranslateAccelerator( return E_NOTIMPL; } -IPropertyPageSiteVtbl PropertyPageSiteVtbl = { +static IPropertyPageSiteVtbl PropertyPageSiteVtbl = { PropertyPageSite_QueryInterface, PropertyPageSite_AddRef, PropertyPageSite_Release,

1 0

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

Dec. 28, 2012

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 Dec. 27, 2012

Dec. 27, 2012

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 Dec. 27, 2012

Dec. 27, 2012

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

Maarten Lankhorst : dsound: Use a thread instead of a timer for greater precision.
by Alexandre Julliard Dec. 27, 2012

Dec. 27, 2012

Module: wine Branch: master Commit: f5abeb8471df40819679982b03177acd7d82b763 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5abeb8471df40819679982b0… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Dec 19 10:30:04 2012 +0100 dsound: Use a thread instead of a timer for greater precision. --- dlls/dsound/dsound.c | 21 +++++++++++---------- dlls/dsound/dsound_private.h | 7 ++++--- dlls/dsound/mixer.c | 39 +++++++++++++++++++++++---------------- dlls/dsound/primary.c | 27 ++++++++++++++++++++++++--- 4 files changed, 62 insertions(+), 32 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index ac85ba2..381d0e1 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -670,14 +670,13 @@ ULONG DirectSoundDevice_Release(DirectSoundDevice * device) TRACE("(%p) ref was %u\n", device, ref + 1); if (!ref) { int i; - timeKillEvent(device->timerID); - timeEndPeriod(DS_TIME_RES); - /* The kill event should have allowed the timer process to expire - * but try to grab the lock just in case. Can't hold lock because - * secondarybuffer_destroy also grabs the lock */ - RtlAcquireResourceShared(&(device->buffer_list_lock), TRUE); - RtlReleaseResource(&(device->buffer_list_lock)); + SetEvent(device->sleepev); + if (device->thread) { + WaitForSingleObject(device->thread, INFINITE); + CloseHandle(device->thread); + } + CloseHandle(device->sleepev); EnterCriticalSection(&DSOUND_renderers_lock); list_remove(&device->entry); @@ -813,6 +812,7 @@ HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcG device->mmdevice = mmdevice; device->guid = devGUID; + device->sleepev = CreateEventW(0, 0, 0, 0); hr = DSOUND_ReopenDevice(device, FALSE); if (FAILED(hr)) @@ -869,9 +869,10 @@ HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcG ZeroMemory(&device->volpan, sizeof(device->volpan)); hr = DSOUND_PrimaryCreate(device); - if (hr == DS_OK) - device->timerID = DSOUND_create_timer(DSOUND_timer, (DWORD_PTR)device); - else + if (hr == DS_OK) { + device->thread = CreateThread(0, 0, DSOUND_mixthread, device, 0, 0); + SetThreadPriority(device->thread, THREAD_PRIORITY_TIME_CRITICAL); + } else WARN("DSOUND_PrimaryCreate failed: %08x\n", hr); *ppDevice = device; diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 62656a5..1a3900c 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -68,9 +68,9 @@ struct DirectSoundDevice GUID guid; DSCAPS drvcaps; - DWORD priolevel; + DWORD priolevel, sleeptime; PWAVEFORMATEX pwfx, primary_pwfx; - UINT timerID, playing_offs_bytes, in_mmdev_bytes, prebuf; + UINT playing_offs_bytes, in_mmdev_bytes, prebuf; DWORD fraglen; LPBYTE buffer; DWORD writelead, buflen, state, playpos, mixpos; @@ -97,6 +97,7 @@ struct DirectSoundDevice IAudioStreamVolume *volume; IAudioRenderClient *render; + HANDLE sleepev, thread; struct list entry; }; @@ -226,7 +227,7 @@ void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan) DECLSPEC_HIDDEN; void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) DECLSPEC_HIDDEN; DWORD DSOUND_secpos_to_bufpos(const IDirectSoundBufferImpl *dsb, DWORD secpos, DWORD secmixpos, float *overshot) DECLSPEC_HIDDEN; -void CALLBACK DSOUND_timer(UINT timerID, UINT msg, DWORD_PTR dwUser, DWORD_PTR dw1, DWORD_PTR dw2) DECLSPEC_HIDDEN; +DWORD CALLBACK DSOUND_mixthread(void *ptr) DECLSPEC_HIDDEN; /* sound3d.c */ diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 84e029b..282808e 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -820,7 +820,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) DSOUND_PrimaryStop(device); } - } else { + } else if (device->state != STATE_STOPPED) { DSOUND_WaveQueue(device, TRUE); @@ -843,22 +843,29 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) /* **** */ } -void CALLBACK DSOUND_timer(UINT timerID, UINT msg, DWORD_PTR dwUser, - DWORD_PTR dw1, DWORD_PTR dw2) +DWORD CALLBACK DSOUND_mixthread(void *p) { - DirectSoundDevice * device = (DirectSoundDevice*)dwUser; - DWORD start_time = GetTickCount(); - DWORD end_time; - TRACE("(%d,%d,0x%lx,0x%lx,0x%lx)\n",timerID,msg,dwUser,dw1,dw2); - TRACE("entering at %d\n", start_time); - - RtlAcquireResourceShared(&(device->buffer_list_lock), TRUE); - - if (device->ref) - DSOUND_PerformMix(device); + DirectSoundDevice *dev = p; + TRACE("(%p)\n", dev); - RtlReleaseResource(&(device->buffer_list_lock)); + while (dev->ref) { + DWORD ret; - end_time = GetTickCount(); - TRACE("completed processing at %d, duration = %d\n", end_time, end_time - start_time); + /* + * Some audio drivers are retarded and won't fire after being + * stopped, add a timeout to handle this. + */ + ret = WaitForSingleObject(dev->sleepev, dev->sleeptime); + if (ret == WAIT_FAILED) + WARN("wait returned error %u %08x!\n", GetLastError(), GetLastError()); + else if (ret != WAIT_OBJECT_0) + WARN("wait returned %08x!\n", ret); + if (!dev->ref) + break; + + RtlAcquireResourceShared(&(dev->buffer_list_lock), TRUE); + DSOUND_PerformMix(dev); + RtlReleaseResource(&(dev->buffer_list_lock)); + } + return 0; } diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 3ac928b..dd810fd 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -152,6 +152,8 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) REFERENCE_TIME prebuf_rt; WAVEFORMATEX *wfx = NULL; HRESULT hres; + REFERENCE_TIME period; + DWORD period_ms; TRACE("(%p, %d)\n", device, forcewave); @@ -192,14 +194,15 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) prebuf_rt = (10000000 * (UINT64)prebuf_frames) / device->pwfx->nSamplesPerSec; hres = IAudioClient_Initialize(device->client, - AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST, - prebuf_rt, 0, device->pwfx, NULL); + AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST | + AUDCLNT_STREAMFLAGS_EVENTCALLBACK, prebuf_rt, 0, device->pwfx, NULL); if(FAILED(hres)){ IAudioClient_Release(device->client); device->client = NULL; WARN("Initialize failed: %08x\n", hres); return hres; } + IAudioClient_SetEventHandle(device->client, device->sleepev); hres = IAudioClient_GetService(device->client, &IID_IAudioRenderClient, (void**)&device->render); @@ -234,6 +237,24 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) return hres; } + /* Now kick off the timer so the event fires periodically */ + hres = IAudioClient_Start(device->client); + if (FAILED(hres)) + WARN("starting failed with %08x\n", hres); + + hres = IAudioClient_GetStreamLatency(device->client, &period); + if (FAILED(hres)) { + WARN("GetStreamLatency failed with %08x\n", hres); + period_ms = 10; + } else + period_ms = (period + 9999) / 10000; + TRACE("period %u ms fraglen %u prebuf %u\n", period_ms, device->fraglen, device->prebuf); + + if (period_ms < 3) + device->sleeptime = 5; + else + device->sleeptime = period_ms * 5 / 2; + return S_OK; } @@ -379,7 +400,7 @@ HRESULT DSOUND_PrimaryPlay(DirectSoundDevice *device) TRACE("(%p)\n", device); hr = IAudioClient_Start(device->client); - if(FAILED(hr)){ + if(FAILED(hr) && hr != AUDCLNT_E_NOT_STOPPED){ WARN("Start failed: %08x\n", hr); return hr; }

1 0