wine-commits December 2012

wine-commits@winehq.org

2 participants
549 discussions

Nikolay Sivov : winedump: Fix argument format for DllMain trace.
by Alexandre Julliard 19 Dec '12

19 Dec '12

Module: wine Branch: master Commit: 140bfd2823e0b43ab6a84b0a889e074303b973ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=140bfd2823e0b43ab6a84b0a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 19 11:22:29 2012 +0400 winedump: Fix argument format for DllMain trace. --- tools/winedump/output.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/winedump/output.c b/tools/winedump/output.c index 93faca7..fecb885 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -237,10 +237,10 @@ void output_c_preamble (void) } fprintf (cfile, - "BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID " - "lpvReserved)\n{\n" - " TRACE(\"(0x%%p, %%d, %%p)\\n\", hinstDLL, fdwReason, lpvReserved);\n\n" - " switch (fdwReason)\n" + "BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID " + "reserved)\n{\n" + " TRACE(\"(%%p, %%u, %%p)\\n\", instance, reason, reserved);\n\n" + " switch (reason)\n" " {\n" " case DLL_WINE_PREATTACH:\n" " return FALSE; /* prefer native version */\n" @@ -253,7 +253,7 @@ void output_c_preamble (void) globals.forward_dll, globals.forward_dll); else fprintf (cfile, - " DisableThreadLibraryCalls(hinstDLL);\n"); + " DisableThreadLibraryCalls(instance);\n"); fprintf (cfile, " break;\n"

1 0

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

19 Dec '12

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

Nikolay Sivov : scrrun: Implement GetFileVersion().
by Alexandre Julliard 19 Dec '12

19 Dec '12

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

Nikolay Sivov : xmllite: Remove dead code.
by Alexandre Julliard 19 Dec '12

19 Dec '12

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 : xmllite: Support comment nodes.
by Alexandre Julliard 19 Dec '12

19 Dec '12

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 19 Dec '12

19 Dec '12

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

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

19 Dec '12

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

Andrew Talbot : ole2disp.dll16: Indentation fix.
by Alexandre Julliard 19 Dec '12

19 Dec '12

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

Andrew Talbot : ole32: Indentation fix.
by Alexandre Julliard 19 Dec '12

19 Dec '12

Module: wine Branch: master Commit: fa96beb5c439c55c935fbd667dd31cbcd7cc3d13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa96beb5c439c55c935fbd667… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Dec 18 22:52:22 2012 +0000 ole32: Indentation fix. --- dlls/ole32/compobj.c | 129 +++++++++++++++++++++---------------------- dlls/ole32/ole2.c | 127 +++++++++++++++++++++--------------------- dlls/ole32/pointermoniker.c | 2 +- 3 files changed, 129 insertions(+), 129 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa96beb5c439c55c935fb…

1 0

Stefan Dösinger : wined3d: Remove draw_*_primitive_up.
by Alexandre Julliard 19 Dec '12

19 Dec '12

Module: wine Branch: master Commit: 8cf55497cc45e2bd7b2a4c09661be0ab7ab06277 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cf55497cc45e2bd7b2a4c096… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 18 22:53:16 2012 +0100 wined3d: Remove draw_*_primitive_up. Note that I can't remove the state->user_stream mess yet, because of draw_*_primitive_strided. Another patchset will deal with that. --- dlls/wined3d/device.c | 100 --------------------------------------------- dlls/wined3d/wined3d.spec | 2 - include/wine/wined3d.h | 5 -- 3 files changed, 0 insertions(+), 107 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7fcc9c8..42cd226 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4160,106 +4160,6 @@ void CDECL wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device draw_primitive(device, start_idx, index_count, start_instance, instance_count, TRUE, NULL); } -HRESULT CDECL wined3d_device_draw_primitive_up(struct wined3d_device *device, UINT vertex_count, - const void *stream_data, UINT stream_stride) -{ - struct wined3d_stream_state *stream; - struct wined3d_buffer *vb; - - TRACE("device %p, vertex count %u, stream_data %p, stream_stride %u.\n", - device, vertex_count, stream_data, stream_stride); - - if (!device->stateBlock->state.vertex_declaration) - { - WARN("Called without a valid vertex declaration set.\n"); - return WINED3DERR_INVALIDCALL; - } - - /* Note in the following, it's not this type, but that's the purpose of streamIsUP */ - stream = &device->stateBlock->state.streams[0]; - vb = stream->buffer; - stream->buffer = (struct wined3d_buffer *)stream_data; - if (vb) - wined3d_buffer_decref(vb); - stream->offset = 0; - stream->stride = stream_stride; - device->stateBlock->state.user_stream = TRUE; - if (device->stateBlock->state.load_base_vertex_index) - { - device->stateBlock->state.load_base_vertex_index = 0; - device_invalidate_state(device, STATE_BASEVERTEXINDEX); - } - - /* TODO: Only mark dirty if drawing from a different UP address */ - device_invalidate_state(device, STATE_STREAMSRC); - - draw_primitive(device, 0, vertex_count, 0, 0, FALSE, NULL); - - /* MSDN specifies stream zero settings must be set to NULL */ - stream->buffer = NULL; - stream->stride = 0; - - /* stream zero settings set to null at end, as per the msdn. No need to - * mark dirty here, the app has to set the new stream sources or use UP - * drawing again. */ - return WINED3D_OK; -} - -HRESULT CDECL wined3d_device_draw_indexed_primitive_up(struct wined3d_device *device, - UINT index_count, const void *index_data, enum wined3d_format_id index_data_format_id, - const void *stream_data, UINT stream_stride) -{ - struct wined3d_stream_state *stream; - struct wined3d_buffer *vb, *ib; - - TRACE("device %p, index_count %u, index_data %p, index_data_format %s, stream_data %p, stream_stride %u.\n", - device, index_count, index_data, debug_d3dformat(index_data_format_id), stream_data, stream_stride); - - if (!device->stateBlock->state.vertex_declaration) - { - WARN("(%p) : Called without a valid vertex declaration set\n", device); - return WINED3DERR_INVALIDCALL; - } - - stream = &device->stateBlock->state.streams[0]; - vb = stream->buffer; - stream->buffer = (struct wined3d_buffer *)stream_data; - if (vb) - wined3d_buffer_decref(vb); - stream->offset = 0; - stream->stride = stream_stride; - device->stateBlock->state.user_stream = TRUE; - device->stateBlock->state.index_format = index_data_format_id; - - /* Set to 0 as per MSDN. Do it now due to the stream source loading during draw_primitive(). */ - device->stateBlock->state.base_vertex_index = 0; - if (device->stateBlock->state.load_base_vertex_index) - { - device->stateBlock->state.load_base_vertex_index = 0; - device_invalidate_state(device, STATE_BASEVERTEXINDEX); - } - /* Invalidate the state until we have nicer tracking of the stream source pointers */ - device_invalidate_state(device, STATE_STREAMSRC); - device_invalidate_state(device, STATE_INDEXBUFFER); - - draw_primitive(device, 0, index_count, 0, 0, TRUE, index_data); - - /* MSDN specifies stream zero settings and index buffer must be set to NULL */ - stream->buffer = NULL; - stream->stride = 0; - ib = device->stateBlock->state.index_buffer; - if (ib) - { - wined3d_buffer_decref(ib); - device->stateBlock->state.index_buffer = NULL; - } - /* No need to mark the stream source state dirty here. Either the app calls UP drawing again, or it has to call - * SetStreamSource to specify a vertex buffer - */ - - return WINED3D_OK; -} - HRESULT CDECL wined3d_device_draw_primitive_strided(struct wined3d_device *device, UINT vertex_count, const struct wined3d_strided_data *strided_data) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 3b39c41..5322be8 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -45,10 +45,8 @@ @ cdecl wined3d_device_draw_indexed_primitive(ptr long long) @ cdecl wined3d_device_draw_indexed_primitive_instanced(ptr long long long long) @ cdecl wined3d_device_draw_indexed_primitive_strided(ptr long ptr long ptr long) -@ cdecl wined3d_device_draw_indexed_primitive_up(ptr long ptr long ptr long) @ cdecl wined3d_device_draw_primitive(ptr long long) @ cdecl wined3d_device_draw_primitive_strided(ptr long ptr) -@ cdecl wined3d_device_draw_primitive_up(ptr long ptr long) @ cdecl wined3d_device_draw_rect_patch(ptr long ptr ptr) @ cdecl wined3d_device_draw_tri_patch(ptr long ptr ptr) @ cdecl wined3d_device_end_scene(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0b07328..77c76ab 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2094,14 +2094,9 @@ void __cdecl wined3d_device_draw_indexed_primitive_instanced(struct wined3d_devi HRESULT __cdecl wined3d_device_draw_indexed_primitive_strided(struct wined3d_device *device, UINT index_count, const struct wined3d_strided_data *strided_data, UINT vertex_count, const void *index_data, enum wined3d_format_id index_data_format_id); -HRESULT __cdecl wined3d_device_draw_indexed_primitive_up(struct wined3d_device *device, - UINT index_count, const void *index_data, enum wined3d_format_id index_data_format_id, - const void *stream_data, UINT stream_stride); HRESULT __cdecl wined3d_device_draw_primitive(struct wined3d_device *device, UINT start_vertex, UINT vertex_count); HRESULT __cdecl wined3d_device_draw_primitive_strided(struct wined3d_device *device, UINT vertex_count, const struct wined3d_strided_data *strided_data); -HRESULT __cdecl wined3d_device_draw_primitive_up(struct wined3d_device *device, - UINT vertex_count, const void *stream_data, UINT stream_stride); HRESULT __cdecl wined3d_device_draw_rect_patch(struct wined3d_device *device, UINT handle, const float *num_segs, const struct wined3d_rect_patch_info *rect_patch_info); HRESULT __cdecl wined3d_device_draw_tri_patch(struct wined3d_device *device, UINT handle,

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
55
Older →

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 December 2012