August 2013 - Wine-commits - list.winehq.org

Huw Davies : ieframe: DdeNameService returns NULL on error.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 1103a241db1ad1a5b86f2465a8cfd33c59bb70a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1103a241db1ad1a5b86f2465a… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 12 10:32:45 2013 +0100 ieframe: DdeNameService returns NULL on error. --- dlls/ieframe/iexplore.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 4232608..0bdb556 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -1008,9 +1008,8 @@ static void init_dde(void) if(!ddestr_openurl) WARN("Failed to create string handle: %u\n", DdeGetLastError(dde_inst)); - res = HandleToULong(DdeNameService(dde_inst, ddestr_iexplore, 0, DNS_REGISTER)); - if(res != DMLERR_NO_ERROR) - WARN("DdeNameService failed: %u\n", res); + if(!DdeNameService(dde_inst, ddestr_iexplore, 0, DNS_REGISTER)) + WARN("DdeNameService failed\n"); } static void release_dde(void)

1 0

Nikolay Sivov : ntdll: Support optional 'versioned' attribute for windowClass sections.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: cddea89d22e5d433b10367b213e4ecc4017d1af1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cddea89d22e5d433b10367b21… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 3 06:40:27 2013 +0400 ntdll: Support optional 'versioned' attribute for windowClass sections. --- dlls/kernel32/tests/actctx.c | 16 ++++++++++- dlls/ntdll/actctx.c | 56 +++++++++++++++++++++++++++++++++--------- 2 files changed, 58 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index ae82a07..234fa9d 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -105,7 +105,7 @@ static const char manifest_wndcls1[] = "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" "<assemblyIdentity version=\"1.2.3.4\" name=\"testdep1\" type=\"win32\" processorArchitecture=\"" ARCH "\"/>" "<file name=\"testlib1.dll\">" -"<windowClass>wndClass1</windowClass>" +"<windowClass versioned=\"yes\">wndClass1</windowClass>" "<windowClass>wndClass2</windowClass>" "</file>" "</assembly>"; @@ -114,7 +114,7 @@ static const char manifest_wndcls2[] = "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" "<assemblyIdentity version=\"4.3.2.1\" name=\"testdep2\" type=\"win32\" processorArchitecture=\"" ARCH "\" />" "<file name=\"testlib2.dll\">" -"<windowClass>wndClass3</windowClass>" +"<windowClass versioned=\"no\">wndClass3</windowClass>" "<windowClass>wndClass4</windowClass>" "</file>" "</assembly>"; @@ -1140,9 +1140,12 @@ todo_wine static void test_wndclass_section(void) { + static const WCHAR cls1W[] = {'1','.','2','.','3','.','4','!','w','n','d','C','l','a','s','s','1',0}; ACTCTX_SECTION_KEYED_DATA data, data2; + struct wndclass_redirect_data *classdata; ULONG_PTR cookie; HANDLE handle; + WCHAR *ptrW; BOOL ret; /* use two dependent manifests, each defines 2 window class redirects */ @@ -1178,6 +1181,15 @@ static void test_wndclass_section(void) ok(data.ulSectionTotalLength == data2.ulSectionTotalLength, "got %u, %u\n", data.ulSectionTotalLength, data2.ulSectionTotalLength); + /* wndClass1 is versioned, wndClass3 is not */ + classdata = (struct wndclass_redirect_data*)data.lpData; + ptrW = (WCHAR*)((BYTE*)data.lpData + classdata->name_offset); + ok(!lstrcmpW(ptrW, cls1W), "got %s\n", wine_dbgstr_w(ptrW)); + + classdata = (struct wndclass_redirect_data*)data2.lpData; + ptrW = (WCHAR*)((BYTE*)data2.lpData + classdata->name_offset); + ok(!lstrcmpW(ptrW, wndClass3W), "got %s\n", wine_dbgstr_w(ptrW)); + ret = pDeactivateActCtx(0, cookie); ok(ret, "DeactivateActCtx failed: %u\n", GetLastError()); diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 1561db8..d5f7055 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -167,6 +167,7 @@ struct entity struct { WCHAR *name; + BOOL versioned; } class; struct { @@ -279,6 +280,9 @@ static const WCHAR tlbidW[] = {'t','l','b','i','d',0}; static const WCHAR typeW[] = {'t','y','p','e',0}; static const WCHAR versionW[] = {'v','e','r','s','i','o','n',0}; static const WCHAR xmlnsW[] = {'x','m','l','n','s',0}; +static const WCHAR versionedW[] = {'v','e','r','s','i','o','n','e','d',0}; +static const WCHAR yesW[] = {'y','e','s',0}; +static const WCHAR noW[] = {'n','o',0}; static const WCHAR xmlW[] = {'?','x','m','l',0}; static const WCHAR manifestv1W[] = {'u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','a','s','m','.','v','1',0}; @@ -1093,15 +1097,30 @@ static int get_assembly_version(struct assembly *assembly, WCHAR *ret) static BOOL parse_window_class_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll, struct actctx_loader* acl) { - xmlstr_t elem, content; - BOOL end = FALSE, ret = TRUE; + xmlstr_t elem, content, attr_name, attr_value; + BOOL end = FALSE, ret = TRUE, error; struct entity* entity; if (!(entity = add_entity(&dll->entities, ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION))) return FALSE; - if (!parse_expect_no_attr(xmlbuf, &end)) return FALSE; - if (end) return FALSE; + entity->u.class.versioned = TRUE; + while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + { + if (xmlstr_cmp(&attr_name, versionedW)) + { + if (xmlstr_cmpi(&attr_value, noW)) + entity->u.class.versioned = FALSE; + else if (!xmlstr_cmpi(&attr_value, yesW)) + return FALSE; + } + else + { + WARN("unknown attr %s=%s\n", debugstr_xmlstr(&attr_name), debugstr_xmlstr(&attr_value)); + } + } + + if (error || end) return end; if (!parse_text_content(xmlbuf, &content)) return FALSE; @@ -1318,7 +1337,6 @@ static BOOL parse_dependency_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl) { if (xmlstr_cmp(&attr_name, optionalW)) { - static const WCHAR yesW[] = {'y','e','s',0}; optional = xmlstr_cmpi( &attr_value, yesW ); TRACE("optional=%s\n", debugstr_xmlstr(&attr_value)); } @@ -2259,16 +2277,19 @@ static NTSTATUS build_wndclass_section(ACTIVATION_CONTEXT* actctx, struct wndcla struct entity *entity = &dll->entities.base[k]; if (entity->kind == ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION) { - int class_len = strlenW(entity->u.class.name); + int class_len = strlenW(entity->u.class.name) + 1; int len; /* each class entry needs index, data and string data */ total_len += sizeof(struct wndclass_index); total_len += sizeof(struct wndclass_redirect_data); /* original name is stored separately */ - total_len += aligned_string_len((class_len+1)*sizeof(WCHAR)); + total_len += aligned_string_len(class_len*sizeof(WCHAR)); /* versioned name and module name are stored one after another */ - len = get_assembly_version(assembly, NULL) + class_len + 2 /* null terminator and '!' separator */; + if (entity->u.class.versioned) + len = get_assembly_version(assembly, NULL) + class_len + 1 /* '!' separator */; + else + len = class_len; len += strlenW(dll->name) + 1; total_len += aligned_string_len(len*sizeof(WCHAR)); @@ -2314,7 +2335,10 @@ static NTSTATUS build_wndclass_section(ACTIVATION_CONTEXT* actctx, struct wndcla RtlHashUnicodeString(&str, TRUE, HASH_STRING_ALGORITHM_X65599, &index->hash); /* include '!' separator too */ - versioned_len = (get_assembly_version(assembly, NULL) + 1)*sizeof(WCHAR) + str.Length; + if (entity->u.class.versioned) + versioned_len = (get_assembly_version(assembly, NULL) + 1)*sizeof(WCHAR) + str.Length; + else + versioned_len = str.Length; module_len = strlenW(dll->name)*sizeof(WCHAR); index->name_offset = name_offset; @@ -2344,9 +2368,17 @@ static NTSTATUS build_wndclass_section(ACTIVATION_CONTEXT* actctx, struct wndcla /* versioned name */ ptrW = (WCHAR*)((BYTE*)data + data->name_offset); - get_assembly_version(assembly, ptrW); - strcatW(ptrW, exclW); - strcatW(ptrW, entity->u.class.name); + if (entity->u.class.versioned) + { + get_assembly_version(assembly, ptrW); + strcatW(ptrW, exclW); + strcatW(ptrW, entity->u.class.name); + } + else + { + memcpy(ptrW, entity->u.class.name, index->name_len); + ptrW[index->name_len/sizeof(WCHAR)] = 0; + } name_offset += sizeof(*data); name_offset += aligned_string_len(str.MaximumLength) + aligned_string_len(versioned_len + module_len + 2*sizeof(WCHAR));

1 0

Nikolay Sivov : ntdll: Implement compatible section for dll redirects.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 2a5a8bc4a32f7e6d408388d9afec0c5a92bc1529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a5a8bc4a32f7e6d408388d9a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 4 18:21:09 2013 +0400 ntdll: Implement compatible section for dll redirects. --- dlls/kernel32/tests/actctx.c | 153 ++++++++++++++++++--------- dlls/ntdll/actctx.c | 238 ++++++++++++++++++++++++++++++++++-------- 2 files changed, 294 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a5a8bc4a32f7e6d40838…

1 0

Andrew Eikum : oleaut32: Don't prevent 64-bit from loading 32-bit typelibs.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: f1398510df7687d36006714b14295833100f8bf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1398510df7687d36006714b1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Aug 12 15:24:02 2013 -0500 oleaut32: Don't prevent 64-bit from loading 32-bit typelibs. --- dlls/oleaut32/typelib.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 100c539..d8e9840 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -548,10 +548,8 @@ HRESULT WINAPI RegisterTypeLib( if (FAILED(ITypeLib_GetLibAttr(ptlib, &attr))) return E_FAIL; -#ifdef _WIN64 - if (attr->syskind != SYS_WIN64) return TYPE_E_BADMODULEKIND; -#else - if (attr->syskind != SYS_WIN32 && attr->syskind != SYS_WIN16) return TYPE_E_BADMODULEKIND; +#ifndef _WIN64 + if (attr->syskind == SYS_WIN64) return TYPE_E_BADMODULEKIND; #endif get_typelib_key( &attr->guid, attr->wMajorVerNum, attr->wMinorVerNum, keyName );

1 0

Andrew Eikum : oleaut32: 64-bit typelib fixes.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: cc29cad2cc925f03fe220c2b40ca8d1d6bd53261 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc29cad2cc925f03fe220c2b4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Aug 12 15:24:14 2013 -0500 oleaut32: 64-bit typelib fixes. --- dlls/oleaut32/typelib.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index d8e9840..031f2b1 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2537,10 +2537,18 @@ static ITypeInfoImpl * MSFT_DoTypeInfo( ptiRet->lcid=pLibInfo->set_lcid; /* FIXME: correct? */ ptiRet->lpstrSchema=NULL; /* reserved */ ptiRet->cbSizeInstance=tiBase.size; +#ifdef _WIN64 + if(pLibInfo->syskind == SYS_WIN32) + ptiRet->cbSizeInstance=sizeof(void*); +#endif ptiRet->typekind=tiBase.typekind & 0xF; ptiRet->cFuncs=LOWORD(tiBase.cElement); ptiRet->cVars=HIWORD(tiBase.cElement); ptiRet->cbAlignment=(tiBase.typekind >> 11 )& 0x1F; /* there are more flags there */ +#ifdef _WIN64 + if(pLibInfo->syskind == SYS_WIN32) + ptiRet->cbAlignment = 8; +#endif ptiRet->wTypeFlags=tiBase.flags; ptiRet->wMajorVerNum=LOWORD(tiBase.version); ptiRet->wMinorVerNum=HIWORD(tiBase.version); @@ -8484,7 +8492,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnCreateTypeInfo(ICreateTypeLib2 *iface, case TKIND_INTERFACE: case TKIND_DISPATCH: case TKIND_COCLASS: - info->cbSizeInstance = 4; + info->cbSizeInstance = This->ptr_size; break; case TKIND_RECORD: case TKIND_UNION: @@ -10199,6 +10207,12 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc(ICreateTypeInfo2 *iface, !funcDesc->cParams) return TYPE_E_INCONSISTENTPROPFUNCS; +#ifdef _WIN64 + if(This->pTypeLib->syskind == SYS_WIN64 && + funcDesc->oVft % 8 != 0) + return E_INVALIDARG; +#endif + memset(&tmp_func_desc, 0, sizeof(tmp_func_desc)); TLBFuncDesc_Constructor(&tmp_func_desc);

1 0

Andrew Eikum : oleaut32: Save typelib SYSKIND.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 6f5cc0887ef19eb2d72a17a5906801b640e6c4d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f5cc0887ef19eb2d72a17a59… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Aug 12 15:24:19 2013 -0500 oleaut32: Save typelib SYSKIND. --- dlls/oleaut32/typelib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 031f2b1..fa37737 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -9698,7 +9698,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface) file.header.magic2 = 0x00010002; file.header.lcid = This->set_lcid ? This->set_lcid : MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US); file.header.lcid2 = This->set_lcid; - file.header.varflags = 0x41; /* TODO?? */ + file.header.varflags = 0x40 | This->syskind; if (This->HelpFile) file.header.varflags |= 0x10; if (This->HelpStringDll)

1 0

Andrew Eikum : oleaut32/tests: Add save/load tests for created typelibs.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 3821eaf391aa12921b99e974ac0f31c3834bcb0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3821eaf391aa12921b99e974a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Aug 12 17:56:33 2013 -0500 oleaut32/tests: Add save/load tests for created typelibs. --- dlls/oleaut32/tests/typelib.c | 869 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 866 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3821eaf391aa12921b99e…

1 0

Andrew Eikum : oleaut32/tests: Test all supported SYSKINDs.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 6c45e6fea3c8f3a5b545b32671aaf82c122fede4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c45e6fea3c8f3a5b545b3267… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Aug 12 17:56:36 2013 -0500 oleaut32/tests: Test all supported SYSKINDs. --- dlls/oleaut32/tests/typelib.c | 187 +++++++++++++++++++++++++---------------- 1 files changed, 113 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c45e6fea3c8f3a5b545b…

1 0

Henri Verbeet : wined3d: Don' t bother downloading buffer contents on destruction.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 5e64fd70496d8a85a3dd8983f01d28a2f9c831bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e64fd70496d8a85a3dd8983f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 13 08:51:44 2013 +0200 wined3d: Don't bother downloading buffer contents on destruction. --- dlls/wined3d/buffer.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 586b16c..3f692e2 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -551,12 +551,21 @@ static void buffer_unload(struct wined3d_resource *resource) ULONG CDECL wined3d_buffer_decref(struct wined3d_buffer *buffer) { ULONG refcount = InterlockedDecrement(&buffer->resource.ref); + struct wined3d_context *context; TRACE("%p decreasing refcount to %u.\n", buffer, refcount); if (!refcount) { - buffer_unload(&buffer->resource); + if (buffer->buffer_object) + { + context = context_acquire(buffer->resource.device, NULL); + delete_gl_buffer(buffer, context->gl_info); + context_release(context); + + HeapFree(GetProcessHeap(), 0, buffer->conversion_map); + } + resource_cleanup(&buffer->resource); buffer->resource.parent_ops->wined3d_object_destroyed(buffer->resource.parent); HeapFree(GetProcessHeap(), 0, buffer->maps);

1 0

Henri Verbeet : wined3d: Make buffer_add_dirty_area() never fail.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 4eb39ec5f44902e218ff13fb4e37cfc9115ca5a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eb39ec5f44902e218ff13fb4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 13 08:51:45 2013 +0200 wined3d: Make buffer_add_dirty_area() never fail. --- dlls/wined3d/buffer.c | 94 +++++++++++++++++++++--------------------------- 1 files changed, 41 insertions(+), 53 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 3f692e2..f2ba88e 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -34,41 +34,43 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define VB_MAXFULLCONVERSIONS 5 /* Number of full conversions before we stop converting */ #define VB_RESETFULLCONVS 20 /* Reset full conversion counts after that number of draws */ -static inline BOOL buffer_add_dirty_area(struct wined3d_buffer *This, UINT offset, UINT size) +static void buffer_add_dirty_area(struct wined3d_buffer *buffer, UINT offset, UINT size) { - if (!This->buffer_object) return TRUE; + if (!buffer->buffer_object) + return; - if (This->maps_size <= This->modified_areas) - { - void *new = HeapReAlloc(GetProcessHeap(), 0, This->maps, - This->maps_size * 2 * sizeof(*This->maps)); - if (!new) - { - ERR("Out of memory\n"); - return FALSE; - } - else - { - This->maps = new; - This->maps_size *= 2; - } - } + if (!offset && !size) + goto invalidate_all; - if(offset > This->resource.size || offset + size > This->resource.size) + if (offset > buffer->resource.size || offset + size > buffer->resource.size) { - WARN("Invalid range dirtified, marking entire buffer dirty\n"); - offset = 0; - size = This->resource.size; + WARN("Invalid range specified, invalidating entire buffer.\n"); + goto invalidate_all; } - else if(!offset && !size) + + if (buffer->modified_areas >= buffer->maps_size) { - size = This->resource.size; + struct wined3d_map_range *new; + + if (!(new = HeapReAlloc(GetProcessHeap(), 0, buffer->maps, 2 * buffer->maps_size * sizeof(*buffer->maps)))) + { + ERR("Failed to allocate maps array, invalidating entire buffer.\n"); + goto invalidate_all; + } + + buffer->maps = new; + buffer->maps_size *= 2; } - This->maps[This->modified_areas].offset = offset; - This->maps[This->modified_areas].size = size; - This->modified_areas++; - return TRUE; + buffer->maps[buffer->modified_areas].offset = offset; + buffer->maps[buffer->modified_areas].size = size; + ++buffer->modified_areas; + return; + +invalidate_all: + buffer->modified_areas = 1; + buffer->maps[0].offset = 0; + buffer->maps[0].size = buffer->resource.size; } static inline void buffer_clear_dirty_areas(struct wined3d_buffer *This) @@ -184,13 +186,9 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, const struc This->buffer_object_size = This->resource.size; This->buffer_object_usage = gl_usage; - if(This->flags & WINED3D_BUFFER_DOUBLEBUFFER) + if (This->flags & WINED3D_BUFFER_DOUBLEBUFFER) { - if(!buffer_add_dirty_area(This, 0, 0)) - { - ERR("buffer_add_dirty_area failed, this is not expected\n"); - goto fail; - } + buffer_add_dirty_area(This, 0, 0); } else { @@ -808,14 +806,10 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) return; } - /* The declaration changed, reload the whole buffer */ - WARN("Reloading buffer because of decl change\n"); - buffer_clear_dirty_areas(buffer); - if (!buffer_add_dirty_area(buffer, 0, 0)) - { - ERR("buffer_add_dirty_area failed, this is not expected\n"); - return; - } + /* The declaration changed, reload the whole buffer. */ + WARN("Reloading buffer because of a vertex declaration change.\n"); + buffer_add_dirty_area(buffer, 0, 0); + /* Avoid unfenced updates, we might overwrite more areas of the buffer than the application * cleared for unsynchronized updates */ @@ -996,20 +990,14 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN TRACE("buffer %p, offset %u, size %u, data %p, flags %#x\n", buffer, offset, size, data, flags); flags = buffer_sanitize_flags(buffer, flags); + /* DISCARD invalidates the entire buffer, regardless of the specified + * offset and size. Some applications also depend on the entire buffer + * being uploaded in that case. Two such applications are Port Royale + * and Darkstar One. */ if (flags & WINED3D_MAP_DISCARD) - { - /* DISCARD invalidates the entire buffer, regardless of the specified - * offset and size. Some applications also depend on the entire buffer - * being uploaded in that case. Two such applications are Port Royale - * and Darkstar One. */ - if (!buffer_add_dirty_area(buffer, 0, 0)) - return E_OUTOFMEMORY; - } + buffer_add_dirty_area(buffer, 0, 0); else if (!(flags & WINED3D_MAP_READONLY)) - { - if (!buffer_add_dirty_area(buffer, offset, size)) - return E_OUTOFMEMORY; - } + buffer_add_dirty_area(buffer, offset, size); count = ++buffer->resource.map_count;

1 0