December 2012 - Wine-Commits

Piotr Caban : msvcrt: Don' t fail when _aligned_offset_malloc is used with size=0.
by Alexandre Julliard Dec. 19, 2012

Dec. 19, 2012

Module: wine Branch: master Commit: 7771552f247660acc472b4862f32c4f8426be180 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7771552f247660acc472b4862… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 19 10:16:45 2012 +0100 msvcrt: Don't fail when _aligned_offset_malloc is used with size=0. --- dlls/msvcrt/heap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 0a0d819..e8c3765 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -384,7 +384,7 @@ void * CDECL _aligned_offset_malloc(MSVCRT_size_t size, MSVCRT_size_t alignment, } /* offset must be less than size */ - if (offset >= size) + if (offset && offset >= size) { *MSVCRT__errno() = MSVCRT_EINVAL; return NULL;

1 0

Andrew Talbot : ole2disp.dll16: Indentation fix.
by Alexandre Julliard Dec. 19, 2012

Dec. 19, 2012

Module: wine Branch: master Commit: 97fdb7a9bac874061fb415f108516005db052d78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97fdb7a9bac874061fb415f10… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Dec 18 22:52:17 2012 +0000 ole2disp.dll16: Indentation fix. --- dlls/ole2disp.dll16/ole2disp.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index 139b492..957d1bc 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -136,22 +136,22 @@ INT16 WINAPI SysReAllocString16(LPBSTR16 pbstr,LPCOLESTR16 oleStr) */ BSTR16 WINAPI SysAllocStringLen16(const char *oleStr, int len) { - BSTR16 out=BSTR_AllocBytes(len+1); + BSTR16 out=BSTR_AllocBytes(len+1); - if (!out) - return 0; + if (!out) + return 0; /* - * Copy the information in the buffer. - * Since it is valid to pass a NULL pointer here, we'll initialize the - * buffer to nul if it is the case. - */ + * Copy the information in the buffer. + * Since it is valid to pass a NULL pointer here, we'll initialize the + * buffer to nul if it is the case. + */ if (oleStr != 0) - strcpy(BSTR_GetAddr(out),oleStr); + strcpy(BSTR_GetAddr(out),oleStr); else - memset(BSTR_GetAddr(out), 0, len+1); + memset(BSTR_GetAddr(out), 0, len+1); - return out; + return out; } /******************************************************************************

1 0

Nikolay Sivov : xmllite: Support comment nodes.
by Alexandre Julliard Dec. 19, 2012

Dec. 19, 2012

Module: wine Branch: master Commit: c085b8d93007c4de9ceeea7d6e1f5c9ac1f7b532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c085b8d93007c4de9ceeea7d6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 19 09:32:37 2012 +0400 xmllite: Support comment nodes. --- dlls/xmllite/reader.c | 33 ++++++++++++++++++++++++++++++--- dlls/xmllite/tests/reader.c | 7 ++----- 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 8fe5ee3..8d6df52 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -777,8 +777,35 @@ static HRESULT reader_parse_xmldecl(xmlreader *reader) /* [15] Comment ::= '' */ static HRESULT reader_parse_comment(xmlreader *reader) { - FIXME("comments not supported\n"); - return E_NOTIMPL; + const WCHAR *start, *ptr; + + /* skip '' */ + reader_skipn(reader, 3); + reader->nodetype = XmlNodeType_Comment; + return S_OK; + } + else + return WC_E_COMMENT; + } + else + { + reader_skipn(reader, 1); + ptr = reader_get_cur(reader); + } + } + + return MX_E_INPUTEND; } /* [16] PI ::= '<?' PITarget (S (Char* - (Char* '?>' Char*)))? '?>' */ @@ -1014,7 +1041,7 @@ static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *nodetype) XmlNodeType oldtype = This->nodetype; HRESULT hr; - FIXME("(%p)->(%p): stub\n", This, nodetype); + TRACE("(%p)->(%p)\n", This, nodetype); if (This->state == XmlReadState_Closed) return S_FALSE; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index ed66dea..41fc94e 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -721,10 +721,9 @@ static void test_read_comment(void) type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); -todo_wine { ok(hr == S_OK, "got %08x\n", hr); ok(type == XmlNodeType_Comment, "got %d\n", type); -} + IStream_Release(stream); stream = create_stream_on_data(xml_comment1, sizeof(xml_comment1)); @@ -733,10 +732,9 @@ todo_wine { type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); -todo_wine { ok(hr == S_OK, "got %08x\n", hr); ok(type == XmlNodeType_Comment, "got %d\n", type); -} + IStream_Release(stream); stream = create_stream_on_data(xml_comment2, sizeof(xml_comment2)); @@ -745,7 +743,6 @@ todo_wine { type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); -todo_wine ok(hr == WC_E_COMMENT || broken(hr == WC_E_GREATERTHAN), "got %08x\n", hr); ok(type == XmlNodeType_None, "got %d\n", type); IStream_Release(stream);

1 0

Nikolay Sivov : xmllite: Track internal parser state to select expected node type.
by Alexandre Julliard Dec. 19, 2012

Dec. 19, 2012

Module: wine Branch: master Commit: 61483a581e647676eb96ebf84d33e94e6941f424 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61483a581e647676eb96ebf84… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 19 09:30:44 2012 +0400 xmllite: Track internal parser state to select expected node type. --- dlls/xmllite/reader.c | 162 ++++++++++++++++++++++++++++++++++--------- dlls/xmllite/tests/reader.c | 62 ++++++++++++++++ 2 files changed, 190 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=61483a581e647676eb96e…

1 0

Nikolay Sivov : xmllite: Remove dead code.
by Alexandre Julliard Dec. 19, 2012

Dec. 19, 2012

Module: wine Branch: master Commit: f2eb6d018fc7ad35931c6befa5e37305d1a93e7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2eb6d018fc7ad35931c6befa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 19 09:33:03 2012 +0400 xmllite: Remove dead code. --- dlls/xmllite/reader.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 8d6df52..5c027ef 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -501,16 +501,7 @@ static inline const WCHAR *reader_get_cur(xmlreader *reader) static int reader_cmp(xmlreader *reader, const WCHAR *str) { const WCHAR *ptr = reader_get_cur(reader); - int i = 0; - return strncmpW(str, ptr, strlenW(str)); - - while (str[i]) { - if (ptr[i] != str[i]) return 0; - i++; - } - - return 1; } /* moves cursor n WCHARs forward */

1 0

Nikolay Sivov : scrrun: Implement GetFileVersion().
by Alexandre Julliard Dec. 19, 2012

Dec. 19, 2012

Module: wine Branch: master Commit: b6eaf8761db2b3cd75f75ed4071b8a17b4ccf919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6eaf8761db2b3cd75f75ed40… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 19 11:17:56 2012 +0400 scrrun: Implement GetFileVersion(). --- dlls/scrrun/Makefile.in | 2 +- dlls/scrrun/filesystem.c | 50 ++++++++++++++++++++++++++++++++++++--- dlls/scrrun/tests/filesystem.c | 38 ++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 5 deletions(-) diff --git a/dlls/scrrun/Makefile.in b/dlls/scrrun/Makefile.in index d8d71b2..4ceac05 100644 --- a/dlls/scrrun/Makefile.in +++ b/dlls/scrrun/Makefile.in @@ -1,5 +1,5 @@ MODULE = scrrun.dll -IMPORTS = uuid oleaut32 +IMPORTS = uuid oleaut32 version C_SRCS = \ dictionary.c \ diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 8fafc7c..4f0b163 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -30,6 +30,7 @@ #include "scrrun_private.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(scrrun); @@ -933,12 +934,53 @@ static HRESULT WINAPI filesys_GetStandardStream(IFileSystem3 *iface, return E_NOTIMPL; } -static HRESULT WINAPI filesys_GetFileVersion(IFileSystem3 *iface, BSTR FileName, - BSTR *FileVersion) +static void get_versionstring(VS_FIXEDFILEINFO *info, WCHAR *ver) { - FIXME("%p %s %p\n", iface, debugstr_w(FileName), FileVersion); + static WCHAR fmtW[] = {'%','d','.','%','d','.','%','d','.','%','d',0}; + DWORDLONG version; + WORD a, b, c, d; - return E_NOTIMPL; + version = (((DWORDLONG)info->dwFileVersionMS) << 32) + info->dwFileVersionLS; + a = (WORD)( version >> 48); + b = (WORD)((version >> 32) & 0xffff); + c = (WORD)((version >> 16) & 0xffff); + d = (WORD)( version & 0xffff); + + sprintfW(ver, fmtW, a, b, c, d); +} + +static HRESULT WINAPI filesys_GetFileVersion(IFileSystem3 *iface, BSTR name, BSTR *version) +{ + static const WCHAR rootW[] = {'\\',0}; + VS_FIXEDFILEINFO *info; + WCHAR ver[30]; + void *ptr; + DWORD len; + BOOL ret; + + TRACE("%p %s %p\n", iface, debugstr_w(name), version); + + len = GetFileVersionInfoSizeW(name, NULL); + if (!len) + return HRESULT_FROM_WIN32(GetLastError()); + + ptr = heap_alloc(len); + if (!GetFileVersionInfoW(name, 0, len, ptr)) + { + heap_free(ptr); + return HRESULT_FROM_WIN32(GetLastError()); + } + + ret = VerQueryValueW(ptr, rootW, (void**)&info, &len); + heap_free(ptr); + if (!ret) + return HRESULT_FROM_WIN32(GetLastError()); + + get_versionstring(info, ver); + *version = SysAllocString(ver); + TRACE("version=%s\n", debugstr_w(ver)); + + return S_OK; } static const struct IFileSystem3Vtbl filesys_vtbl = diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index e0c8684..b93927c 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -217,6 +217,43 @@ todo_wine { DeleteFileW(testfileW); } +static void test_GetFileVersion(void) +{ + static const WCHAR k32W[] = {'\\','k','e','r','n','e','l','3','2','.','d','l','l',0}; + static const WCHAR k33W[] = {'\\','k','e','r','n','e','l','3','3','.','d','l','l',0}; + WCHAR pathW[MAX_PATH], filenameW[MAX_PATH]; + BSTR path, version; + HRESULT hr; + + GetSystemDirectoryW(pathW, sizeof(pathW)/sizeof(WCHAR)); + + lstrcpyW(filenameW, pathW); + lstrcatW(filenameW, k32W); + + path = SysAllocString(filenameW); + hr = IFileSystem3_GetFileVersion(fs3, path, &version); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(*version != 0, "got %s\n", wine_dbgstr_w(version)); + SysFreeString(version); + SysFreeString(path); + + lstrcpyW(filenameW, pathW); + lstrcatW(filenameW, k33W); + + path = SysAllocString(filenameW); + version = (void*)0xdeadbeef; + hr = IFileSystem3_GetFileVersion(fs3, path, &version); + ok(broken(hr == S_OK) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); + if (hr == S_OK) + { + ok(*version == 0, "got %s\n", wine_dbgstr_w(version)); + SysFreeString(version); + } + else + ok(version == (void*)0xdeadbeef, "got %p\n", version); + SysFreeString(path); +} + START_TEST(filesystem) { HRESULT hr; @@ -233,6 +270,7 @@ START_TEST(filesystem) test_interfaces(); test_createfolder(); test_textstream(); + test_GetFileVersion(); IFileSystem3_Release(fs3);

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard Dec. 19, 2012

Dec. 19, 2012

Module: wine Branch: master Commit: ef56b7a448a1f98e8390fcc49f9465f011d09f00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef56b7a448a1f98e8390fcc49… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 19 04:15:58 2012 +0100 po: Update French translation. --- po/fr.po | 26 +++++++------------------- 1 files changed, 7 insertions(+), 19 deletions(-) diff --git a/po/fr.po b/po/fr.po index 7aa66d3..f6bc590 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-10-29 21:13+0100\n" +"PO-Revision-Date: 2012-12-19 21:13+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -8304,20 +8304,16 @@ msgid "Security Warning" msgstr "Alerte de sécurité" #: urlmon.rc:32 -#, fuzzy -#| msgid "Do you want to continue anyway?" msgid "Do you want to install this software?" -msgstr "Voulez-vous tout de même continuer ?" +msgstr "Voulez-vous installer ce logiciel ?" #: urlmon.rc:34 explorer.rc:29 msgid "Location:" msgstr "Emplacement :" #: urlmon.rc:36 -#, fuzzy -#| msgid "Install/Uninstall" msgid "Don't install" -msgstr "Installation/Désinstallation" +msgstr "Ne pas installer" #: urlmon.rc:40 msgid "" @@ -8326,22 +8322,16 @@ msgid "" msgstr "" #: urlmon.rc:47 -#, fuzzy -#| msgid "Installation transform failed to apply.\n" msgid "Installation of component failed: %08x" -msgstr "Le fichier de transformation d'installation n'a pu être appliqué.\n" +msgstr "Échec de l'installation du composant : %08x" #: urlmon.rc:48 -#, fuzzy -#| msgid "&Install" msgid "Install (%d)" -msgstr "&Installer" +msgstr "Installer (%d)" #: urlmon.rc:49 -#, fuzzy -#| msgid "&Install" msgid "Install" -msgstr "&Installer" +msgstr "Installer" #: user32.rc:27 user32.rc:40 taskmgr.rc:138 msgctxt "window" @@ -10210,10 +10200,8 @@ msgid "Wine Command Prompt" msgstr "Invite de commande Wine" #: cmd.rc:349 -#, fuzzy -#| msgid "CMD Version %1!S!\n" msgid "Wine CMD Version %1!S!\n" -msgstr "CMD version %1!S!\n" +msgstr "Wine CMD version %1!S!\n" #: cmd.rc:350 msgid "More? "

1 0

Hans Leidekker : msi: Fix a test failure on Windows 8 and conform to the more recent behavior.
by Alexandre Julliard Dec. 19, 2012

Dec. 19, 2012

Module: wine Branch: master Commit: 61db36556a2d9d8fd27aa1e9a21b86bac911e049 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61db36556a2d9d8fd27aa1e9a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 19 12:00:42 2012 +0100 msi: Fix a test failure on Windows 8 and conform to the more recent behavior. --- dlls/msi/automation.c | 2 +- dlls/msi/tests/automation.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 8164463..0b12e29 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1616,7 +1616,7 @@ static HRESULT session_invoke( static void variant_from_registry_value(VARIANT *pVarResult, DWORD dwType, LPBYTE lpData, DWORD dwSize) { static const WCHAR szREG_BINARY[] = { '(','R','E','G','_','B','I','N','A','R','Y',')',0 }; - static const WCHAR szREG_[] = { '(','R','E','G','_',']',0 }; + static const WCHAR szREG_[] = { '(','R','E','G','_','?','?',')',0 }; WCHAR *szString = (WCHAR *)lpData; LPWSTR szNewString = NULL; DWORD dwNewSize = 0; diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index bc0a632..c1c1d4a 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -2006,6 +2006,7 @@ static void test_Installer_RegistryValue(void) static const WCHAR szFiveHi[] = { 'F','i','v','e','\n','H','i',0 }; static const WCHAR szSix[] = { 'S','i','x',0 }; static const WCHAR szREG_[] = { '(','R','E','G','_',']',0 }; + static const WCHAR szREG_2[] = { '(','R','E','G','_','?','?',')',0 }; static const WCHAR szSeven[] = { 'S','e','v','e','n',0 }; static const WCHAR szEight[] = { 'E','i','g','h','t',0 }; static const WCHAR szBlank[] = { 0 }; @@ -2117,7 +2118,8 @@ static void test_Installer_RegistryValue(void) memset(szString, 0, sizeof(szString)); hr = Installer_RegistryValueW(curr_user, szKey, szSix, szString); ok(hr == S_OK, "Installer_RegistryValueW failed, hresult 0x%08x\n", hr); - ok_w2("Registry value \"%s\" does not match expected \"%s\"\n", szString, szREG_); + ok(!lstrcmpW(szString, szREG_2) || broken(!lstrcmpW(szString, szREG_)), + "Registry value does not match\n"); VariantInit(&vararg); V_VT(&vararg) = VT_BSTR;

1 0

Nikolay Sivov : version: Remove 'return' from void function.
by Alexandre Julliard Dec. 19, 2012

Dec. 19, 2012

Module: wine Branch: master Commit: f3f81387f10c44ea091fed828f9960aeada53f0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3f81387f10c44ea091fed828… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 19 11:18:55 2012 +0400 version: Remove 'return' from void function. --- dlls/version/tests/info.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index e3e5c90..f19b3d7 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -194,8 +194,6 @@ static void VersionDwordLong2String(DWORDLONG Version, LPSTR lpszVerString) d = (WORD)(Version & 0xffff); sprintf(lpszVerString, "%d.%d.%d.%d", a, b, c, d); - - return; } static void test_info(void)

1 0

Stefan Dösinger : d3d8: Use a dynamic vertex buffer for DrawPrimitiveUP.
by Alexandre Julliard Dec. 19, 2012

Dec. 19, 2012

Module: wine Branch: master Commit: 7dd4460bc80351ff2303dfb22ec9ab3e04292099 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dd4460bc80351ff2303dfb22… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 18 22:53:12 2012 +0100 d3d8: Use a dynamic vertex buffer for DrawPrimitiveUP. --- dlls/d3d8/d3d8_private.h | 5 +++ dlls/d3d8/device.c | 90 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 91 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 9ae6077..4c50e82 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -158,6 +158,11 @@ struct d3d8_device struct FvfToDecl *decls; UINT numConvertedDecls, declArraySize; + /* User data draws */ + struct wined3d_buffer *vertex_buffer; + UINT vertex_buffer_size; + UINT vertex_buffer_pos; + /* Avoids recursion with nested ReleaseRef to 0 */ BOOL inDestruction; BOOL lost; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index d8d230f..e1e8e78 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -357,6 +357,9 @@ static ULONG WINAPI d3d8_device_Release(IDirect3DDevice8 *iface) } HeapFree(GetProcessHeap(), 0, device->decls); + if (device->vertex_buffer) + wined3d_buffer_decref(device->vertex_buffer); + wined3d_device_uninit_3d(device->wined3d_device); wined3d_device_release_focus_window(device->wined3d_device); wined3d_device_decref(device->wined3d_device); @@ -595,6 +598,14 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, TRACE("iface %p, present_parameters %p.\n", iface, present_parameters); wined3d_mutex_lock(); + + if (device->vertex_buffer) + { + wined3d_buffer_decref(device->vertex_buffer); + device->vertex_buffer = NULL; + device->vertex_buffer_size = 0; + } + wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, NULL, reset_enum_callback, TRUE))) @@ -1887,23 +1898,94 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitive(IDirect3DDevice8 *iface, return hr; } +static void STDMETHODCALLTYPE d3d8_null_wined3d_object_destroyed(void *parent) {} + +static const struct wined3d_parent_ops d3d8_null_wined3d_parent_ops = +{ + d3d8_null_wined3d_object_destroyed, +}; + +/* The caller is responsible for wined3d locking */ +static HRESULT d3d8_device_prepare_vertex_buffer(struct d3d8_device *device, UINT min_size) +{ + HRESULT hr; + + if (device->vertex_buffer_size < min_size || !device->vertex_buffer) + { + UINT size = max(device->vertex_buffer_size * 2, min_size); + struct wined3d_buffer *buffer; + + TRACE("Growing vertex buffer to %u bytes\n", size); + + hr = wined3d_buffer_create_vb(device->wined3d_device, size, WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, + WINED3D_POOL_DEFAULT, NULL, &d3d8_null_wined3d_parent_ops, &buffer); + if (FAILED(hr)) + { + ERR("(%p) wined3d_buffer_create_vb failed with hr = %08x\n", device, hr); + return hr; + } + + if (device->vertex_buffer) + wined3d_buffer_decref(device->vertex_buffer); + + device->vertex_buffer = buffer; + device->vertex_buffer_size = size; + device->vertex_buffer_pos = 0; + } + return D3D_OK; +} + static HRESULT WINAPI d3d8_device_DrawPrimitiveUP(IDirect3DDevice8 *iface, D3DPRIMITIVETYPE primitive_type, UINT primitive_count, const void *data, UINT stride) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); HRESULT hr; + UINT vtx_count = vertex_count_from_primitive_count(primitive_type, primitive_count); + UINT size = vtx_count * stride; + UINT vb_pos, align; + BYTE *buffer_data; TRACE("iface %p, primitive_type %#x, primitive_count %u, data %p, stride %u.\n", iface, primitive_type, primitive_count, data, stride); + if (!primitive_count) + { + WARN("primitive_count is 0, returning D3D_OK\n"); + return D3D_OK; + } + wined3d_mutex_lock(); + hr = d3d8_device_prepare_vertex_buffer(device, size); + if (FAILED(hr)) + goto done; + + vb_pos = device->vertex_buffer_pos; + align = vb_pos % stride; + if (align) align = stride - align; + if (vb_pos + size + align > device->vertex_buffer_size) + vb_pos = 0; + else + vb_pos += align; + + hr = wined3d_buffer_map(device->vertex_buffer, vb_pos, size, &buffer_data, + vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); + if (FAILED(hr)) + goto done; + memcpy(buffer_data, data, size); + wined3d_buffer_unmap(device->vertex_buffer); + device->vertex_buffer_pos = vb_pos + size; + + hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, stride); + if (FAILED(hr)) + goto done; + wined3d_device_set_primitive_type(device->wined3d_device, primitive_type); - hr = wined3d_device_draw_primitive_up(device->wined3d_device, - vertex_count_from_primitive_count(primitive_type, primitive_count), - data, stride); - wined3d_mutex_unlock(); + hr = wined3d_device_draw_primitive(device->wined3d_device, vb_pos / stride, vtx_count); + wined3d_device_set_stream_source(device->wined3d_device, 0, NULL, 0, 0); +done: + wined3d_mutex_unlock(); return hr; }

1 0