wine-commits August 2013

wine-commits@winehq.org

2 participants
461 discussions

Alexandre Julliard : Wine release 1.7.1
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: website Branch: master Commit: df3af5303930063cea75bdc998b1bba56319bf5c URL: http://source.winehq.org/git/website.git/?a=commit;h=df3af5303930063cea75bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 30 20:03:10 2013 +0200 Wine release 1.7.1 --- news/en/2013083001.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/en/2013083001.xml b/news/en/2013083001.xml new file mode 100644 index 0000000..3b536d8 --- /dev/null +++ b/news/en/2013083001.xml @@ -0,0 +1,18 @@ +<news> +<date>August 30, 2013</date> +<title>Wine 1.7.1 Released</title> +<body> + The Wine development release 1.7.1 is now available. + <a href="{$root}/announce/1.7.1">What's new</a> in this release: +<ul> + <li>Support for keyed event objects.</li> + <li>Support for the "init once" synchronization mechanism.</li> + <li>Activation context support for DLLs, typelibs, and COM classes.</li> + <li>Support for loading 32-bit typelibs on 64-bit.</li> + <li>Various Mac driver fixes.</li> + <li>Some fixes for serial port devices.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.1.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.7.1.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: c71bbc7d24647f225e95beee3299d48b62e6b80c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c71bbc7d24647f225e95beee3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 30 19:55:16 2013 +0200 Release 1.7.1. --- ANNOUNCE | 860 +++++++++++++++++++++++++++++++++++-------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 514 insertions(+), 369 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c71bbc7d24647f225e95b…

1 0

Tag wine-1.7.1 : Alexandre Julliard : Release 1.7.1
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: refs/tags/wine-1.7.1 Tag: 0bebfb2472318832856aa795a913a921116480e1 URL: http://source.winehq.org/git/wine.git/?a=tag;h=0bebfb2472318832856aa795a913… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 30 19:55:16 2013 +0200 Release 1.7.1

1 0

Nikolay Sivov : mshtml: Use defined dispid instead of a magic value.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: e07dabf2d91f5659ab17a2d7a0d36cb054d4eb43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e07dabf2d91f5659ab17a2d7a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 30 14:56:41 2013 +0400 mshtml: Use defined dispid instead of a magic value. --- dlls/mshtml/htmldoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index ce9320c..0df30da 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -453,7 +453,7 @@ static HRESULT WINAPI HTMLDocument_put_designMode(IHTMLDocument2 *iface, BSTR v) if(FAILED(hres)) return hres; - call_property_onchanged(&This->cp_container, 1014); + call_property_onchanged(&This->cp_container, DISPID_IHTMLDOCUMENT2_DESIGNMODE); return S_OK; }

1 0

Nikolay Sivov : ole32/tests: Some tests for redirection in CoGetPSClsid().
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: 8902aae99171320416076e8ba96b209d5b7045f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8902aae99171320416076e8ba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 30 12:59:06 2013 +0400 ole32/tests: Some tests for redirection in CoGetPSClsid(). --- dlls/ole32/tests/compobj.c | 59 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 519cb74..8912498 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -55,6 +55,12 @@ static void (WINAPI *pReleaseActCtx)(HANDLE); static const CLSID CLSID_non_existent = { 0x12345678, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; static const CLSID CLSID_StdFont = { 0x0be35203, 0x8f91, 0x11ce, { 0x9d, 0xe3, 0x00, 0xaa, 0x00, 0x4b, 0xb8, 0x51 } }; +static const GUID IID_Testiface = { 0x22222222, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; +static const GUID IID_Testiface2 = { 0x32222222, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; +static const GUID IID_Testiface3 = { 0x42222222, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; +static const GUID IID_Testiface4 = { 0x52222222, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; +static const GUID IID_TestPS = { 0x66666666, 0x8888, 0x7777, { 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55 } }; + static WCHAR stdfont[] = {'S','t','d','F','o','n','t',0}; static const WCHAR wszNonExistent[] = {'N','o','n','E','x','i','s','t','e','n','t',0}; static WCHAR wszCLSID_StdFont[] = @@ -230,7 +236,26 @@ static const char actctx_manifest[] = " <comClass clsid=\"{0be35203-8f91-11ce-9de3-00aa004bb852}\"" " progid=\"StdFont\"" " />" +" <comInterfaceProxyStub " +" name=\"Iifaceps\"" +" iid=\"{22222222-1234-1234-1234-56789abcdef0}\"" +" proxyStubClsid32=\"{66666666-8888-7777-6666-555555555555}\"" +" />" "</file>" +" <comInterfaceExternalProxyStub " +" name=\"Iifaceps2\"" +" iid=\"{32222222-1234-1234-1234-56789abcdef0}\"" +" />" +" <comInterfaceExternalProxyStub " +" name=\"Iifaceps3\"" +" iid=\"{42222222-1234-1234-1234-56789abcdef0}\"" +" proxyStubClsid32=\"{66666666-8888-7777-6666-555555555555}\"" +" />" +" <comInterfaceExternalProxyStub " +" name=\"Iifaceps4\"" +" iid=\"{52222222-1234-1234-1234-56789abcdef0}\"" +" proxyStubClsid32=\"{00000000-0000-0000-0000-000000000000}\"" +" />" "</assembly>"; DEFINE_GUID(CLSID_Testclass, 0x12345678, 0x1234, 0x1234, 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0); @@ -904,6 +929,8 @@ static void test_CoRegisterPSClsid(void) static void test_CoGetPSClsid(void) { + ULONG_PTR cookie; + HANDLE handle; HRESULT hr; CLSID clsid; HKEY hkey; @@ -952,6 +979,38 @@ static void test_CoGetPSClsid(void) ok(!res, "RegOverridePredefKey returned %d\n", res); RegCloseKey(hkey); + + /* not registered CLSID */ + hr = CoGetPSClsid(&IID_Testiface, &clsid); + ok(hr == REGDB_E_IIDNOTREG, "got 0x%08x\n", hr); + + if ((handle = activate_context(actctx_manifest, &cookie))) + { +todo_wine { + memset(&clsid, 0, sizeof(clsid)); + hr = CoGetPSClsid(&IID_Testiface, &clsid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&clsid, &IID_Testiface), "got clsid %s\n", debugstr_guid(&clsid)); + + memset(&clsid, 0, sizeof(clsid)); + hr = CoGetPSClsid(&IID_Testiface2, &clsid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&clsid, &IID_Testiface2), "got clsid %s\n", debugstr_guid(&clsid)); + + memset(&clsid, 0, sizeof(clsid)); + hr = CoGetPSClsid(&IID_Testiface3, &clsid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&clsid, &IID_TestPS), "got clsid %s\n", debugstr_guid(&clsid)); + + memset(&clsid, 0xaa, sizeof(clsid)); + hr = CoGetPSClsid(&IID_Testiface4, &clsid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&clsid, &GUID_NULL), "got clsid %s\n", debugstr_guid(&clsid)); +} + pDeactivateActCtx(0, cookie); + pReleaseActCtx(handle); + } + CoUninitialize(); }

1 0

Dmitry Timoshkov : kernel32/tests: Add a FlushFileBuffers test for a COM port.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: f69ec2c61c675974cafc4161d74aab60fe751338 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f69ec2c61c675974cafc4161d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 30 18:20:26 2013 +0900 kernel32/tests: Add a FlushFileBuffers test for a COM port. --- dlls/kernel32/tests/comm.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 647c07a..e5264c8 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -1872,9 +1872,35 @@ done: CloseHandle(hcom); } +static void test_FlushFileBuffers(void) +{ + HANDLE hcom; + DWORD ret, bytes, errors; + COMSTAT stat; + + hcom = test_OpenComm(FALSE); + if (hcom == INVALID_HANDLE_VALUE) return; + + ret = WriteFile(hcom, "\0\0\0\0\0\0\0", 7, &bytes, NULL); + ok(ret, "WriteFile error %d\n", GetLastError()); + ok(bytes == 7, "expected 7, got %u\n", bytes); + + ret = FlushFileBuffers(hcom); + ok(ret, "FlushFileBuffers error %d\n", GetLastError()); + + ret = ClearCommError(hcom, &errors, &stat); + ok(ret, "ClearCommError error %d\n", GetLastError()); + ok(stat.cbInQue == 0, "expected 0, got %d bytes in InQueue\n", stat.cbInQue); + ok(stat.cbOutQue == 0, "expected 0, got %d bytes in OutQueue\n", stat.cbOutQue); + ok(errors == 0, "expected errors 0, got %#x\n", errors); + + CloseHandle(hcom); +} + START_TEST(comm) { test_ClearCommError(); /* keep it the very first test */ + test_FlushFileBuffers(); test_BuildCommDCB(); test_ReadTimeOut(); test_waittxempty();

1 0

Henri Verbeet : d3dx9: Avoid LPCWSTR.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: 82710124e364953789426554481e82faef7be74c URL: http://source.winehq.org/git/wine.git/?a=commit;h=82710124e3649537894265544… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 30 08:42:48 2013 +0200 d3dx9: Avoid LPCWSTR. --- dlls/d3dx9_36/d3dx9_36_private.h | 2 +- dlls/d3dx9_36/shader.c | 12 ++++++++++-- dlls/d3dx9_36/surface.c | 13 +++++++------ dlls/d3dx9_36/util.c | 2 +- include/d3dx9core.h | 2 +- include/d3dx9tex.h | 4 ++-- 6 files changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index 08a73c2..451615b 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -67,7 +67,7 @@ struct pixel_format_desc { void (*to_rgba)(const struct vec4 *src, struct vec4 *dst, const PALETTEENTRY *palette); }; -HRESULT map_view_of_file(LPCWSTR filename, LPVOID *buffer, DWORD *length) DECLSPEC_HIDDEN; +HRESULT map_view_of_file(const WCHAR *filename, void **buffer, DWORD *length) DECLSPEC_HIDDEN; HRESULT load_resource_into_memory(HMODULE module, HRSRC resinfo, LPVOID *buffer, DWORD *length) DECLSPEC_HIDDEN; HRESULT write_buffer_to_file(const WCHAR *filename, ID3DXBuffer *buffer) DECLSPEC_HIDDEN; diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index e3f6d5c..66a38ab 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -347,7 +347,10 @@ HRESULT WINAPI D3DXAssembleShaderFromResourceW(HMODULE module, const WCHAR *reso HRSRC res; DWORD len; - if (!(res = FindResourceW(module, resource, (LPCWSTR)RT_RCDATA))) + TRACE("module %p, resource %s, defines %p, include %p, flags %#x, shader %p, error_messages %p.\n", + module, debugstr_w(resource), defines, include, flags, shader, error_messages); + + if (!(res = FindResourceW(module, resource, (const WCHAR *)RT_RCDATA))) return D3DXERR_INVALIDDATA; if (FAILED(load_resource_into_memory(module, res, &buffer, &len))) return D3DXERR_INVALIDDATA; @@ -468,7 +471,12 @@ HRESULT WINAPI D3DXCompileShaderFromResourceW(HMODULE module, const WCHAR *resou HRSRC res; DWORD len; - if (!(res = FindResourceW(module, resource, (LPCWSTR)RT_RCDATA))) + TRACE("module %p, resource %s, defines %p, include %p, entrypoint %s, profile %s, " + "flags %#x, shader %p, error_messages %p, constant_table %p.\n", + module, debugstr_w(resource), defines, include, debugstr_a(entrypoint), debugstr_a(profile), + flags, shader, error_messages, constant_table); + + if (!(res = FindResourceW(module, resource, (const WCHAR *)RT_RCDATA))) return D3DXERR_INVALIDDATA; if (FAILED(load_resource_into_memory(module, res, &buffer, &len))) return D3DXERR_INVALIDDATA; diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 9b76457..2f4499e 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -919,18 +919,19 @@ HRESULT WINAPI D3DXGetImageInfoFromFileA(LPCSTR file, D3DXIMAGE_INFO *info) return hr; } -HRESULT WINAPI D3DXGetImageInfoFromFileW(LPCWSTR file, D3DXIMAGE_INFO *info) +HRESULT WINAPI D3DXGetImageInfoFromFileW(const WCHAR *file, D3DXIMAGE_INFO *info) { + void *buffer; HRESULT hr; DWORD size; - LPVOID buffer; - TRACE("(%s, %p): relay\n", debugstr_w(file), info); + TRACE("file %s, info %p.\n", debugstr_w(file), info); - if( !file ) return D3DERR_INVALIDCALL; + if (!file) + return D3DERR_INVALIDCALL; - hr = map_view_of_file(file, &buffer, &size); - if(FAILED(hr)) return D3DXERR_INVALIDDATA; + if (FAILED(map_view_of_file(file, &buffer, &size))) + return D3DXERR_INVALIDDATA; hr = D3DXGetImageInfoFromFileInMemory(buffer, size, info); UnmapViewOfFile(buffer); diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 5463e42..1fae956 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -108,7 +108,7 @@ static const struct pixel_format_desc formats[] = * The caller must UnmapViewOfFile when it doesn't need the data anymore * */ -HRESULT map_view_of_file(LPCWSTR filename, LPVOID *buffer, DWORD *length) +HRESULT map_view_of_file(const WCHAR *filename, void **buffer, DWORD *length) { HANDLE hfile, hmapping = NULL; diff --git a/include/d3dx9core.h b/include/d3dx9core.h index b6226d6..c28fe71 100644 --- a/include/d3dx9core.h +++ b/include/d3dx9core.h @@ -144,7 +144,7 @@ DECLARE_INTERFACE_(ID3DXFont, IUnknown) STDMETHOD(PreloadCharacters)(THIS_ UINT first, UINT last) PURE; STDMETHOD(PreloadGlyphs)(THIS_ UINT first, UINT last) PURE; STDMETHOD(PreloadTextA)(THIS_ LPCSTR string, INT count) PURE; - STDMETHOD(PreloadTextW)(THIS_ LPCWSTR string, INT count) PURE; + STDMETHOD(PreloadTextW)(THIS_ const WCHAR *string, INT count) PURE; STDMETHOD_(INT, DrawTextA)(THIS_ struct ID3DXSprite *sprite, const char *string, INT count, RECT *rect, DWORD format, D3DCOLOR color) PURE; diff --git a/include/d3dx9tex.h b/include/d3dx9tex.h index d10e01d..295a324 100644 --- a/include/d3dx9tex.h +++ b/include/d3dx9tex.h @@ -93,11 +93,11 @@ extern "C" { /* Image Information */ HRESULT WINAPI D3DXGetImageInfoFromFileA(LPCSTR file, D3DXIMAGE_INFO *info); -HRESULT WINAPI D3DXGetImageInfoFromFileW(LPCWSTR file, D3DXIMAGE_INFO *info); +HRESULT WINAPI D3DXGetImageInfoFromFileW(const WCHAR *file, D3DXIMAGE_INFO *info); #define D3DXGetImageInfoFromFile WINELIB_NAME_AW(D3DXGetImageInfoFromFile) HRESULT WINAPI D3DXGetImageInfoFromResourceA(HMODULE module, LPCSTR resource, D3DXIMAGE_INFO *info); -HRESULT WINAPI D3DXGetImageInfoFromResourceW(HMODULE module, LPCWSTR resource, D3DXIMAGE_INFO *info); +HRESULT WINAPI D3DXGetImageInfoFromResourceW(HMODULE module, const WCHAR *resource, D3DXIMAGE_INFO *info); #define D3DXGetImageInfoFromResource WINELIB_NAME_AW(D3DXGetImageInfoFromResource) HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3DXIMAGE_INFO *info);

1 0

Henri Verbeet : d3dx9: Avoid some needless casts.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: 7175367ad5c010dfe83b921cad4ff92a626722d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7175367ad5c010dfe83b921ca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 30 08:42:47 2013 +0200 d3dx9: Avoid some needless casts. --- dlls/d3dx9_36/shader.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 8e5236d..e3f6d5c 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -328,13 +328,13 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(const WCHAR *filename, const D3DXMACR HRESULT WINAPI D3DXAssembleShaderFromResourceA(HMODULE module, const char *resource, const D3DXMACRO *defines, ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages) { + void *buffer; HRSRC res; - LPCSTR buffer; DWORD len; if (!(res = FindResourceA(module, resource, (LPCSTR)RT_RCDATA))) return D3DXERR_INVALIDDATA; - if (FAILED(load_resource_into_memory(module, res, (LPVOID *)&buffer, &len))) + if (FAILED(load_resource_into_memory(module, res, &buffer, &len))) return D3DXERR_INVALIDDATA; return D3DXAssembleShader(buffer, len, defines, include, flags, shader, error_messages); @@ -343,13 +343,13 @@ HRESULT WINAPI D3DXAssembleShaderFromResourceA(HMODULE module, const char *resou HRESULT WINAPI D3DXAssembleShaderFromResourceW(HMODULE module, const WCHAR *resource, const D3DXMACRO *defines, ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages) { + void *buffer; HRSRC res; - LPCSTR buffer; DWORD len; if (!(res = FindResourceW(module, resource, (LPCWSTR)RT_RCDATA))) return D3DXERR_INVALIDDATA; - if (FAILED(load_resource_into_memory(module, res, (LPVOID *)&buffer, &len))) + if (FAILED(load_resource_into_memory(module, res, &buffer, &len))) return D3DXERR_INVALIDDATA; return D3DXAssembleShader(buffer, len, defines, include, flags, shader, error_messages); @@ -448,13 +448,13 @@ HRESULT WINAPI D3DXCompileShaderFromResourceA(HMODULE module, const char *resour ID3DXInclude *include, const char *entrypoint, const char *profile, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages, ID3DXConstantTable **constant_table) { + void *buffer; HRSRC res; - LPCSTR buffer; DWORD len; if (!(res = FindResourceA(module, resource, (LPCSTR)RT_RCDATA))) return D3DXERR_INVALIDDATA; - if (FAILED(load_resource_into_memory(module, res, (LPVOID *)&buffer, &len))) + if (FAILED(load_resource_into_memory(module, res, &buffer, &len))) return D3DXERR_INVALIDDATA; return D3DXCompileShader(buffer, len, defines, include, entrypoint, profile, flags, shader, error_messages, constant_table); @@ -464,13 +464,13 @@ HRESULT WINAPI D3DXCompileShaderFromResourceW(HMODULE module, const WCHAR *resou ID3DXInclude *include, const char *entrypoint, const char *profile, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages, ID3DXConstantTable **constant_table) { + void *buffer; HRSRC res; - LPCSTR buffer; DWORD len; if (!(res = FindResourceW(module, resource, (LPCWSTR)RT_RCDATA))) return D3DXERR_INVALIDDATA; - if (FAILED(load_resource_into_memory(module, res, (LPVOID *)&buffer, &len))) + if (FAILED(load_resource_into_memory(module, res, &buffer, &len))) return D3DXERR_INVALIDDATA; return D3DXCompileShader(buffer, len, defines, include, entrypoint, profile, flags, shader, error_messages, constant_table); @@ -534,13 +534,13 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileW(const WCHAR *filename, const D3DXMA HRESULT WINAPI D3DXPreprocessShaderFromResourceA(HMODULE module, const char *resource, const D3DXMACRO *defines, ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages) { + void *buffer; HRSRC res; - const char *buffer; DWORD len; if (!(res = FindResourceA(module, resource, (LPCSTR)RT_RCDATA))) return D3DXERR_INVALIDDATA; - if (FAILED(load_resource_into_memory(module, res, (LPVOID *)&buffer, &len))) + if (FAILED(load_resource_into_memory(module, res, &buffer, &len))) return D3DXERR_INVALIDDATA; return D3DXPreprocessShader(buffer, len, defines, include, shader, error_messages); @@ -549,13 +549,13 @@ HRESULT WINAPI D3DXPreprocessShaderFromResourceA(HMODULE module, const char *res HRESULT WINAPI D3DXPreprocessShaderFromResourceW(HMODULE module, const WCHAR *resource, const D3DXMACRO *defines, ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages) { + void *buffer; HRSRC res; - const char *buffer; DWORD len; if (!(res = FindResourceW(module, resource, (const WCHAR *)RT_RCDATA))) return D3DXERR_INVALIDDATA; - if (FAILED(load_resource_into_memory(module, res, (void **)&buffer, &len))) + if (FAILED(load_resource_into_memory(module, res, &buffer, &len))) return D3DXERR_INVALIDDATA; return D3DXPreprocessShader(buffer, len, defines, include, shader, error_messages);

1 0

Henri Verbeet : wined3d: Move the DEFAULT_REFRESH_RATE constant to directx. c.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: f7b84fe7550843a49cd273d5760c7318eeb0c44b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7b84fe7550843a49cd273d57… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 30 08:42:46 2013 +0200 wined3d: Move the DEFAULT_REFRESH_RATE constant to directx.c. --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e235043..570299b3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); #define WINE_DEFAULT_VIDMEM (64 * 1024 * 1024) +#define DEFAULT_REFRESH_RATE 0 /* The driver names reflect the lowest GPU supported * by a certain driver, so DRIVER_AMD_R300 supports diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c111e73..2f8c6b2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2572,8 +2572,6 @@ HDC swapchain_get_backup_dc(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_update_render_to_fbo(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; -#define DEFAULT_REFRESH_RATE 0 - /***************************************************************************** * Utility function prototypes */

1 0

Henri Verbeet : wined3d: Move the WINED3D_MAX_FBO_ENTRIES constant to context.c.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: 53f747de1b987f14c52b214c89f9ad8e32de9baf URL: http://source.winehq.org/git/wine.git/?a=commit;h=53f747de1b987f14c52b214c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 30 08:42:45 2013 +0200 wined3d: Move the WINED3D_MAX_FBO_ENTRIES constant to context.c. --- dlls/wined3d/context.c | 2 ++ dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index cd1cfd4..e8a5a83 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -33,6 +33,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); WINE_DECLARE_DEBUG_CHANNEL(d3d_synchronous); +#define WINED3D_MAX_FBO_ENTRIES 64 + static DWORD wined3d_context_tls_idx; /* FBO helper functions */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 05a6250..c111e73 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1014,8 +1014,6 @@ enum fogsource { FOGSOURCE_COORD, }; -#define WINED3D_MAX_FBO_ENTRIES 64 - struct wined3d_occlusion_query { struct list entry;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2013