June 2011 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Check for a valid source rectangle and destination in wined3d_device_update_surface ().
by Alexandre Julliard 15 Jun '11

15 Jun '11

Module: wine Branch: master Commit: 410a8e86f5cfbae84ea8f011d769d4e63fa67b78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=410a8e86f5cfbae84ea8f011d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 14 20:28:09 2011 +0200 wined3d: Check for a valid source rectangle and destination in wined3d_device_update_surface(). --- dlls/wined3d/device.c | 44 +++++++++++++++++++++++++++++++++++--------- 1 files changed, 35 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 19a9a45..d907d9a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4738,7 +4738,9 @@ HRESULT CDECL wined3d_device_update_surface(struct wined3d_device *device, struct wined3d_context *context; struct wined3d_bo_address data; struct wined3d_format format; + UINT update_w, update_h; CONVERT_TYPES convert; + UINT dst_w, dst_h; DWORD sampler; POINT p; RECT r; @@ -4769,6 +4771,39 @@ HRESULT CDECL wined3d_device_update_surface(struct wined3d_device *device, p.y = 0; dst_point = &p; } + else if (dst_point->x < 0 || dst_point->y < 0) + { + WARN("Invalid destination point.\n"); + return WINED3DERR_INVALIDCALL; + } + + if (!src_rect) + { + r.left = 0; + r.top = 0; + r.right = src_surface->resource.width; + r.bottom = src_surface->resource.height; + src_rect = &r; + } + else if (src_rect->left < 0 || src_rect->left >= r.right + || src_rect->top < 0 || src_rect->top >= r.bottom) + { + WARN("Invalid source rectangle.\n"); + return WINED3DERR_INVALIDCALL; + } + + dst_w = dst_surface->resource.width; + dst_h = dst_surface->resource.height; + + update_w = src_rect->right - src_rect->left; + update_h = src_rect->bottom - src_rect->top; + + if (update_w > dst_w || dst_point->x > dst_w - update_w + || update_h > dst_h || dst_point->y > dst_h - update_h) + { + WARN("Destination out of bounds.\n"); + return WINED3DERR_INVALIDCALL; + } /* This call loads the OpenGL surface directly, instead of copying the * surface to the destination's sysmem copy. If surface conversion is @@ -4790,15 +4825,6 @@ HRESULT CDECL wined3d_device_update_surface(struct wined3d_device *device, surface_internal_preload(dst_surface, SRGB_RGB); surface_bind(dst_surface, gl_info, FALSE); - if (!src_rect) - { - r.left = 0; - r.top = 0; - r.right = src_surface->resource.width; - r.bottom = src_surface->resource.height; - src_rect = &r; - } - data.buffer_object = 0; data.addr = src_surface->resource.allocatedMemory;

1 0

Henri Verbeet : wined3d: Check the source rectangle is a multiple of the format block size in wined3d_device_update_surface ().
by Alexandre Julliard 15 Jun '11

15 Jun '11

Module: wine Branch: master Commit: c19c26e4be76e206043f8a81b5b5f39589df4cbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c19c26e4be76e206043f8a81b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 14 20:28:10 2011 +0200 wined3d: Check the source rectangle is a multiple of the format block size in wined3d_device_update_surface(). --- dlls/wined3d/device.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d907d9a..ba5db37 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4741,6 +4741,7 @@ HRESULT CDECL wined3d_device_update_surface(struct wined3d_device *device, UINT update_w, update_h; CONVERT_TYPES convert; UINT dst_w, dst_h; + UINT src_w, src_h; DWORD sampler; POINT p; RECT r; @@ -4792,6 +4793,9 @@ HRESULT CDECL wined3d_device_update_surface(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } + src_w = src_surface->resource.width; + src_h = src_surface->resource.height; + dst_w = dst_surface->resource.width; dst_h = dst_surface->resource.height; @@ -4805,6 +4809,14 @@ HRESULT CDECL wined3d_device_update_surface(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } + /* NPOT block sizes would be silly. */ + if ((update_w & (src_format->block_width - 1) || update_h & (src_format->block_height - 1)) + && (src_w != update_w || dst_w != update_w || src_h != update_h || dst_h != update_h)) + { + WARN("Update rect not block-aligned.\n"); + return WINED3DERR_INVALIDCALL; + } + /* This call loads the OpenGL surface directly, instead of copying the * surface to the destination's sysmem copy. If surface conversion is * needed, use BltFast instead to copy in sysmem and use regular surface @@ -4831,8 +4843,7 @@ HRESULT CDECL wined3d_device_update_surface(struct wined3d_device *device, if (!data.addr) ERR("Source surface has no allocated memory, but should be a sysmem surface.\n"); - surface_upload_data(dst_surface, gl_info, src_format, src_rect, - src_surface->resource.width, dst_point, FALSE, &data); + surface_upload_data(dst_surface, gl_info, src_format, src_rect, src_w, dst_point, FALSE, &data); context_release(context);

1 0

Alexandre Julliard : rpcrt4: Implement calling server functions on x86_64.
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: 0ce27385fd7c322dba74a3cb609f059865c5becd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ce27385fd7c322dba74a3cb6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 13 12:43:12 2011 +0200 rpcrt4: Implement calling server functions on x86_64. --- dlls/rpcrt4/ndr_stubless.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index da895e1..7fd7e6a 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1003,6 +1003,48 @@ __ASM_GLOBAL_FUNC(call_server_func, __ASM_CFI(".cfi_def_cfa %esp,4\n\t") __ASM_CFI(".cfi_same_value %ebp\n\t") "ret" ) +#elif defined __x86_64__ +LONG_PTR __cdecl call_server_func(SERVER_ROUTINE func, unsigned char * args, unsigned int stack_size); +__ASM_GLOBAL_FUNC( call_server_func, + "pushq %rbp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") + __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") + "movq %rsp,%rbp\n\t" + __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") + "pushq %rsi\n\t" + __ASM_CFI(".cfi_rel_offset %rsi,-8\n\t") + "pushq %rdi\n\t" + __ASM_CFI(".cfi_rel_offset %rdi,-16\n\t") + "movq %rcx,%rax\n\t" /* function to call */ + "movq $32,%rcx\n\t" /* allocate max(32,stack_size) bytes of stack space */ + "cmpq %rcx,%r8\n\t" + "cmovgq %r8,%rcx\n\t" + "subq %rcx,%rsp\n\t" + "andq $~15,%rsp\n\t" + "movq %r8,%rcx\n\t" + "shrq $3,%rcx\n\t" + "movq %rsp,%rdi\n\t" + "movq %rdx,%rsi\n\t" + "rep; movsq\n\t" /* copy arguments */ + "movq 0(%rsp),%rcx\n\t" + "movq 8(%rsp),%rdx\n\t" + "movq 16(%rsp),%r8\n\t" + "movq 24(%rsp),%r9\n\t" + "movq %rcx,%xmm0\n\t" + "movq %rdx,%xmm1\n\t" + "movq %r8,%xmm2\n\t" + "movq %r9,%xmm3\n\t" + "callq *%rax\n\t" + "leaq -16(%rbp),%rsp\n\t" /* restore stack */ + "popq %rdi\n\t" + __ASM_CFI(".cfi_same_value %rdi\n\t") + "popq %rsi\n\t" + __ASM_CFI(".cfi_same_value %rsi\n\t") + __ASM_CFI(".cfi_def_cfa_register %rsp\n\t") + "popq %rbp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") + __ASM_CFI(".cfi_same_value %rbp\n\t") + "ret") #else #warning call_server_func not implemented for your architecture LONG_PTR __cdecl call_server_func(SERVER_ROUTINE func, unsigned char * args, unsigned short stack_size)

1 0

Aric Stewart : usp10: Correct an endless loop in Chaining Contextual Substitution if it is a dead rule .
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: 4b2bfb4a8b887a149276e52005bc3004bfa550bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b2bfb4a8b887a149276e5200… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 14 08:36:00 2011 -0500 usp10: Correct an endless loop in Chaining Contextual Substitution if it is a dead rule. --- dlls/usp10/shape.c | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 03d97f4..32833c9 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1026,20 +1026,24 @@ static INT GSUB_apply_ChainContextSubst(const GSUB_LookupList* lookup, const GSU ccsf3_4 = (const GSUB_ChainContextSubstFormat3_4 *)(((LPBYTE)ccsf3_3)+sizeof(GSUB_ChainContextSubstFormat3_3) + (sizeof(WORD) * (GET_BE_WORD(ccsf3_3->LookaheadGlyphCount)-1))); - for (k = 0; k < GET_BE_WORD(ccsf3_4->SubstCount); k++) + if (GET_BE_WORD(ccsf3_4->SubstCount)) { - int lookupIndex = GET_BE_WORD(ccsf3_4->SubstLookupRecord[k].LookupListIndex); - int SequenceIndex = GET_BE_WORD(ccsf3_4->SubstLookupRecord[k].SequenceIndex) * write_dir; - - TRACE("SUBST: %i -> %i %i\n",k, SequenceIndex, lookupIndex); - newIndex = GSUB_apply_lookup(lookup, lookupIndex, glyphs, glyph_index + SequenceIndex, write_dir, glyph_count); - if (newIndex == -1) + for (k = 0; k < GET_BE_WORD(ccsf3_4->SubstCount); k++) { - ERR("Chain failed to generate a glyph\n"); - continue; + int lookupIndex = GET_BE_WORD(ccsf3_4->SubstLookupRecord[k].LookupListIndex); + int SequenceIndex = GET_BE_WORD(ccsf3_4->SubstLookupRecord[k].SequenceIndex) * write_dir; + + TRACE("SUBST: %i -> %i %i\n",k, SequenceIndex, lookupIndex); + newIndex = GSUB_apply_lookup(lookup, lookupIndex, glyphs, glyph_index + SequenceIndex, write_dir, glyph_count); + if (newIndex == -1) + { + ERR("Chain failed to generate a glyph\n"); + continue; + } } + return newIndex; } - return newIndex; + else return GSUB_E_NOGLYPH; } } return -1;

1 0

Andrew Nguyen : dxdiag: Add code for XML information output.
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: b14e164281067cfe9ff894b0b329e3feaa20fea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b14e164281067cfe9ff894b0b… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jun 14 08:02:18 2011 -0500 dxdiag: Add code for XML information output. --- programs/dxdiag/output.c | 186 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 184 insertions(+), 2 deletions(-) diff --git a/programs/dxdiag/output.c b/programs/dxdiag/output.c index 5176f69..574b843 100644 --- a/programs/dxdiag/output.c +++ b/programs/dxdiag/output.c @@ -18,8 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_LEAN_AND_MEAN +#define COBJMACROS +#include <initguid.h> #include <windows.h> +#include <msxml2.h> #include <assert.h> #include <stdio.h> @@ -33,6 +35,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); static char output_buffer[1024]; static const char crlf[2] = "\r\n"; +static const WCHAR DxDiag[] = {'D','x','D','i','a','g',0}; + +static const WCHAR SystemInformation[] = {'S','y','s','t','e','m','I','n','f','o','r','m','a','t','i','o','n',0}; +static const WCHAR Time[] = {'T','i','m','e',0}; +static const WCHAR MachineName[] = {'M','a','c','h','i','n','e','N','a','m','e',0}; +static const WCHAR OperatingSystem[] = {'O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; +static const WCHAR Language[] = {'L','a','n','g','u','a','g','e',0}; +static const WCHAR SystemManufacturer[] = {'S','y','s','t','e','m','M','a','n','u','f','a','c','t','u','r','e','r',0}; +static const WCHAR SystemModel[] = {'S','y','s','t','e','m','M','o','d','e','l',0}; +static const WCHAR BIOS[] = {'B','I','O','S',0}; +static const WCHAR Processor[] = {'P','r','o','c','e','s','s','o','r',0}; +static const WCHAR Memory[] = {'M','e','m','o','r','y',0}; +static const WCHAR PageFile[] = {'P','a','g','e','F','i','l','e',0}; +static const WCHAR WindowsDir[] = {'W','i','n','d','o','w','s','D','i','r',0}; +static const WCHAR DirectXVersion[] = {'D','i','r','e','c','t','X','V','e','r','s','i','o','n',0}; +static const WCHAR DXSetupParameters[] = {'D','X','S','e','t','u','p','P','a','r','a','m','e','t','e','r','s',0}; +static const WCHAR DxDiagVersion[] = {'D','x','D','i','a','g','V','e','r','s','i','o','n',0}; +static const WCHAR DxDiagUnicode[] = {'D','x','D','i','a','g','U','n','i','c','o','d','e',0}; +static const WCHAR DxDiag64Bit[] = {'D','x','D','i','a','g','6','4','B','i','t',0}; + static BOOL output_text_header(HANDLE hFile, const char *caption) { DWORD len = strlen(caption); @@ -148,9 +170,169 @@ static BOOL output_text_information(struct dxdiag_information *dxdiag_info, cons return FALSE; } +static IXMLDOMElement *xml_create_element(IXMLDOMDocument *xmldoc, const WCHAR *name) +{ + BSTR bstr = SysAllocString(name); + IXMLDOMElement *ret; + HRESULT hr; + + if (!bstr) + return NULL; + + hr = IXMLDOMDocument_createElement(xmldoc, bstr, &ret); + SysFreeString(bstr); + + return SUCCEEDED(hr) ? ret : NULL; +} + +static HRESULT xml_put_element_text(IXMLDOMElement *element, const WCHAR *text) +{ + BSTR bstr = SysAllocString(text); + HRESULT hr; + + if (!bstr) + return E_OUTOFMEMORY; + + hr = IXMLDOMElement_put_text(element, bstr); + SysFreeString(bstr); + + return hr; +} + +static HRESULT save_xml_document(IXMLDOMDocument *xmldoc, const WCHAR *filename) +{ + BSTR bstr = SysAllocString(filename); + VARIANT destVar; + HRESULT hr; + + if (!bstr) + return E_OUTOFMEMORY; + + V_VT(&destVar) = VT_BSTR; + V_BSTR(&destVar) = bstr; + + hr = IXMLDOMDocument_save(xmldoc, destVar); + VariantClear(&destVar); + + return hr; +} + static BOOL output_xml_information(struct dxdiag_information *dxdiag_info, const WCHAR *filename) { - WINE_FIXME("XML information output is not implemented\n"); + static const WCHAR zeroW[] = {'0',0}; + static const WCHAR oneW[] = {'1',0}; + + const struct information_block + { + const WCHAR *tag_name; + struct information_field + { + const WCHAR *tag_name; + const WCHAR *value; + } fields[50]; + } output_table[] = + { + {SystemInformation, + { + {Time, dxdiag_info->system_info.szTimeEnglish}, + {MachineName, dxdiag_info->system_info.szMachineNameEnglish}, + {OperatingSystem, dxdiag_info->system_info.szOSExLongEnglish}, + {Language, dxdiag_info->system_info.szLanguagesEnglish}, + {SystemManufacturer, dxdiag_info->system_info.szSystemManufacturerEnglish}, + {SystemModel, dxdiag_info->system_info.szSystemManufacturerEnglish}, + {BIOS, dxdiag_info->system_info.szSystemManufacturerEnglish}, + {Processor, dxdiag_info->system_info.szProcessorEnglish}, + {Memory, dxdiag_info->system_info.szPhysicalMemoryEnglish}, + {PageFile, dxdiag_info->system_info.szPageFileEnglish}, + {WindowsDir, dxdiag_info->system_info.szWindowsDir}, + {DirectXVersion, dxdiag_info->system_info.szDirectXVersionLongEnglish}, + {DXSetupParameters, dxdiag_info->system_info.szSetupParamEnglish}, + {DxDiagVersion, dxdiag_info->system_info.szDxDiagVersion}, + {DxDiagUnicode, oneW}, + {DxDiag64Bit, dxdiag_info->system_info.win64 ? oneW : zeroW}, + {NULL, NULL}, + } + }, + }; + + IXMLDOMDocument *xmldoc = NULL; + IXMLDOMElement *dxdiag_element = NULL; + HRESULT hr; + size_t i; + + hr = CoCreateInstance(&CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, + &IID_IXMLDOMDocument, (void **)&xmldoc); + if (FAILED(hr)) + { + WINE_ERR("IXMLDOMDocument instance creation failed with 0x%08x\n", hr); + goto error; + } + + if (!(dxdiag_element = xml_create_element(xmldoc, DxDiag))) + goto error; + + hr = IXMLDOMDocument_appendChild(xmldoc, (IXMLDOMNode *)dxdiag_element, NULL); + if (FAILED(hr)) + goto error; + + for (i = 0; i < sizeof(output_table)/sizeof(output_table[0]); i++) + { + IXMLDOMElement *info_element = xml_create_element(xmldoc, output_table[i].tag_name); + const struct information_field *fields = output_table[i].fields; + unsigned int j = 0; + + if (!info_element) + goto error; + + hr = IXMLDOMElement_appendChild(dxdiag_element, (IXMLDOMNode *)info_element, NULL); + if (FAILED(hr)) + { + IXMLDOMElement_Release(info_element); + goto error; + } + + for (j = 0; fields[j].tag_name; j++) + { + IXMLDOMElement *field_element = xml_create_element(xmldoc, fields[j].tag_name); + + if (!field_element) + { + IXMLDOMElement_Release(info_element); + goto error; + } + + hr = xml_put_element_text(field_element, fields[j].value); + if (FAILED(hr)) + { + IXMLDOMElement_Release(field_element); + IXMLDOMElement_Release(info_element); + goto error; + } + + hr = IXMLDOMElement_appendChild(info_element, (IXMLDOMNode *)field_element, NULL); + if (FAILED(hr)) + { + IXMLDOMElement_Release(field_element); + IXMLDOMElement_Release(info_element); + goto error; + } + + IXMLDOMElement_Release(field_element); + } + + IXMLDOMElement_Release(info_element); + } + + hr = save_xml_document(xmldoc, filename); + if (FAILED(hr)) + goto error; + + IXMLDOMElement_Release(dxdiag_element); + IXMLDOMDocument_Release(xmldoc); + return TRUE; +error: + if (dxdiag_element) IXMLDOMElement_Release(dxdiag_element); + if (xmldoc) IXMLDOMDocument_Release(xmldoc); return FALSE; }

1 0

Mariusz Pluciński : shell32/tests: Verify known folders available in system.
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: 25fd65e4f0c43559f759af58e8ebaeceb10edc1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=25fd65e4f0c43559f759af58e… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Tue Jun 14 13:08:59 2011 +0200 shell32/tests: Verify known folders available in system. --- dlls/shell32/tests/shellpath.c | 164 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 162 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index add59db..72868db 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -883,16 +883,169 @@ if (0) { /* crashes */ ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); } +/* Standard CSIDL values (and their flags) uses only two less-significant bytes */ +#define NO_CSIDL 0x10000 +#define CSIDL_TODO_WINE 0x20000 +#define KNOWN_FOLDER(id, csidl) \ + { &id, # id, csidl, # csidl, __LINE__ } + +struct knownFolderDef { + const KNOWNFOLDERID *folderId; + const char *sFolderId; + const int csidl; + const char *sCsidl; + const int line; +}; + +static const struct knownFolderDef known_folders[] = { + KNOWN_FOLDER(FOLDERID_AddNewPrograms, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_AddNewPrograms, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_AdminTools, CSIDL_ADMINTOOLS), + KNOWN_FOLDER(FOLDERID_AppUpdates, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_CDBurning, CSIDL_CDBURN_AREA), + KNOWN_FOLDER(FOLDERID_ChangeRemovePrograms, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_CommonAdminTools, CSIDL_COMMON_ADMINTOOLS), + KNOWN_FOLDER(FOLDERID_CommonOEMLinks, CSIDL_COMMON_OEM_LINKS), + KNOWN_FOLDER(FOLDERID_CommonPrograms, CSIDL_COMMON_PROGRAMS), + KNOWN_FOLDER(FOLDERID_CommonStartMenu, CSIDL_COMMON_STARTMENU), + KNOWN_FOLDER(FOLDERID_CommonStartup, CSIDL_COMMON_STARTUP), + KNOWN_FOLDER(FOLDERID_CommonTemplates, CSIDL_COMMON_TEMPLATES), + KNOWN_FOLDER(FOLDERID_ComputerFolder, CSIDL_DRIVES), + KNOWN_FOLDER(FOLDERID_ConflictFolder, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_ConnectionsFolder, CSIDL_CONNECTIONS), + KNOWN_FOLDER(FOLDERID_Contacts, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_ControlPanelFolder, CSIDL_CONTROLS), + KNOWN_FOLDER(FOLDERID_Cookies, CSIDL_COOKIES), + KNOWN_FOLDER(FOLDERID_Desktop, CSIDL_DESKTOP), + KNOWN_FOLDER(FOLDERID_DeviceMetadataStore, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_Documents, CSIDL_MYDOCUMENTS | CSIDL_TODO_WINE), + KNOWN_FOLDER(FOLDERID_DocumentsLibrary, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_Downloads, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_Favorites, CSIDL_FAVORITES), + KNOWN_FOLDER(FOLDERID_Fonts, CSIDL_FONTS), + KNOWN_FOLDER(FOLDERID_Games, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_GameTasks, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_History, CSIDL_HISTORY), + KNOWN_FOLDER(FOLDERID_HomeGroup, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_ImplicitAppShortcuts, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_InternetCache, CSIDL_INTERNET_CACHE), + KNOWN_FOLDER(FOLDERID_InternetFolder, CSIDL_INTERNET), + KNOWN_FOLDER(FOLDERID_Libraries, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_Links, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_LocalAppData, CSIDL_LOCAL_APPDATA), + KNOWN_FOLDER(FOLDERID_LocalAppDataLow, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_LocalizedResourcesDir, CSIDL_RESOURCES_LOCALIZED), + KNOWN_FOLDER(FOLDERID_Music, CSIDL_MYMUSIC), + KNOWN_FOLDER(FOLDERID_MusicLibrary, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_NetHood, CSIDL_NETHOOD), + KNOWN_FOLDER(FOLDERID_NetworkFolder, CSIDL_NETWORK), + KNOWN_FOLDER(FOLDERID_OriginalImages, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_PhotoAlbums, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_Pictures, CSIDL_MYPICTURES), + KNOWN_FOLDER(FOLDERID_PicturesLibrary, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_Playlists, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_PrintersFolder, CSIDL_PRINTERS), + KNOWN_FOLDER(FOLDERID_PrintHood, CSIDL_PRINTHOOD), + KNOWN_FOLDER(FOLDERID_Profile, CSIDL_PROFILE), + KNOWN_FOLDER(FOLDERID_ProgramData, CSIDL_COMMON_APPDATA), + KNOWN_FOLDER(FOLDERID_ProgramFiles, CSIDL_PROGRAM_FILES), + KNOWN_FOLDER(FOLDERID_ProgramFilesCommon, CSIDL_PROGRAM_FILES_COMMON), + KNOWN_FOLDER(FOLDERID_ProgramFilesCommonX86, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_ProgramFilesX86, CSIDL_PROGRAM_FILESX86), + KNOWN_FOLDER(FOLDERID_Programs, CSIDL_PROGRAMS), + KNOWN_FOLDER(FOLDERID_Public, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_PublicDesktop, CSIDL_COMMON_DESKTOPDIRECTORY), + KNOWN_FOLDER(FOLDERID_PublicDocuments, CSIDL_COMMON_DOCUMENTS), + KNOWN_FOLDER(FOLDERID_PublicDownloads, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_PublicGameTasks, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_PublicLibraries, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_PublicMusic, CSIDL_COMMON_MUSIC), + KNOWN_FOLDER(FOLDERID_PublicPictures, CSIDL_COMMON_PICTURES), + KNOWN_FOLDER(FOLDERID_PublicRingtones, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_PublicVideos, CSIDL_COMMON_VIDEO), + KNOWN_FOLDER(FOLDERID_QuickLaunch, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_Recent, CSIDL_RECENT), + KNOWN_FOLDER(FOLDERID_RecordedTVLibrary, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_RecycleBinFolder, CSIDL_BITBUCKET), + KNOWN_FOLDER(FOLDERID_ResourceDir, CSIDL_RESOURCES), + KNOWN_FOLDER(FOLDERID_Ringtones, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_RoamingAppData, CSIDL_APPDATA), + KNOWN_FOLDER(FOLDERID_SampleMusic, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_SamplePictures, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_SamplePlaylists, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_SampleVideos, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_SavedGames, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_SavedSearches, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_SEARCH_CSC, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_SearchHome, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_SEARCH_MAPI, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_SendTo, CSIDL_SENDTO), + KNOWN_FOLDER(FOLDERID_SidebarDefaultParts, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_SidebarParts, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_StartMenu, CSIDL_STARTMENU), + KNOWN_FOLDER(FOLDERID_Startup, CSIDL_STARTUP), + KNOWN_FOLDER(FOLDERID_SyncManagerFolder, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_SyncResultsFolder, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_SyncSetupFolder, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_System, CSIDL_SYSTEM), + KNOWN_FOLDER(FOLDERID_SystemX86, CSIDL_SYSTEMX86), + KNOWN_FOLDER(FOLDERID_Templates, CSIDL_TEMPLATES), + KNOWN_FOLDER(FOLDERID_UserPinned, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_UserProfiles, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_UserProgramFiles, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_UserProgramFilesCommon, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_UsersFiles, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_UsersLibraries, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_Videos, CSIDL_MYVIDEO), + KNOWN_FOLDER(FOLDERID_VideosLibrary, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_Windows, CSIDL_WINDOWS), + { NULL, NULL, 0, NULL } +}; +#undef KNOWN_FOLDER + +static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId) +{ + HRESULT hr; + const struct knownFolderDef *known_folder = &known_folders[0]; + int csidl, expectedCsidl; + + while(known_folder->folderId != NULL) + { + if(IsEqualGUID(known_folder->folderId, folderId)) + { + /* verify CSIDL */ + if(known_folder->csidl != NO_CSIDL) + { + expectedCsidl = known_folder->csidl & (~CSIDL_TODO_WINE); + + hr = IKnownFolderManager_FolderIdToCsidl(mgr, folderId, &csidl); + ok_(__FILE__, known_folder->line)(hr == S_OK, "cannot retrieve CSIDL for folder %s\n", known_folder->sFolderId); + + if(known_folder->csidl & CSIDL_TODO_WINE) + todo_wine ok_(__FILE__, known_folder->line)(csidl == expectedCsidl, "invalid CSIDL retrieved for folder %s. %d (%s) expected, but %d found\n", known_folder->sFolderId, expectedCsidl, known_folder->sCsidl, csidl); + else + ok_(__FILE__, known_folder->line)(csidl == expectedCsidl, "invalid CSIDL retrieved for folder %s. %d (%s) expected, but %d found\n", known_folder->sFolderId, expectedCsidl, known_folder->sCsidl, csidl); + } + + break; + } + known_folder++; + } +} +#undef NO_CSIDL +#undef CSIDL_TODO_WINE + static void test_knownFolders(void) { static const WCHAR sWindows[] = {'W','i','n','d','o','w','s',0}; HRESULT hr; IKnownFolderManager *mgr = NULL; IKnownFolder *folder = NULL; - KNOWNFOLDERID folderId; + KNOWNFOLDERID folderId, *folders; KF_CATEGORY cat = 0; KNOWNFOLDER_DEFINITION kfDefinition; - int csidl; + int csidl, i; + UINT nCount = 0; LPWSTR folderPath; KF_REDIRECTION_CAPABILITIES redirectionCapabilities = 1; WCHAR sWinDir[MAX_PATH]; @@ -976,6 +1129,13 @@ static void test_knownFolders(void) ok(hr == S_OK, "failed to release KnownFolder instance: 0x%08x\n", hr); } + hr = IKnownFolderManager_GetFolderIds(mgr, &folders, &nCount); + ok(hr == S_OK, "failed to get known folders: 0x%08x\n", hr); + for(i=0;i<nCount;++i) + check_known_folder(mgr, &folders[i]); + + CoTaskMemFree(folders); + hr = IKnownFolderManager_Release(mgr); ok(hr == S_OK, "failed to release KnownFolderManager instance: 0x%08x\n", hr); }

1 0

Mariusz Pluciński : shell32/tests: Add test of IKnownFolderManager::Register/UnregisterFolder.
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: 70bbfa7ed82af09719101d81cd96468c4a8dcd47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70bbfa7ed82af09719101d81c… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Tue Jun 14 13:09:14 2011 +0200 shell32/tests: Add test of IKnownFolderManager::Register/UnregisterFolder. --- dlls/shell32/tests/shellpath.c | 61 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 60 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 72868db..a506488 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1038,6 +1038,8 @@ static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId static void test_knownFolders(void) { static const WCHAR sWindows[] = {'W','i','n','d','o','w','s',0}; + static const WCHAR sExample[] = {'E','x','a','m','p','l','e',0}; + static const KNOWNFOLDERID newFolderId = {0x01234567, 0x89AB, 0xCDEF, {0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x01} }; HRESULT hr; IKnownFolderManager *mgr = NULL; IKnownFolder *folder = NULL; @@ -1048,10 +1050,14 @@ static void test_knownFolders(void) UINT nCount = 0; LPWSTR folderPath; KF_REDIRECTION_CAPABILITIES redirectionCapabilities = 1; - WCHAR sWinDir[MAX_PATH]; + WCHAR sWinDir[MAX_PATH], sExamplePath[MAX_PATH]; + BOOL bRes; GetWindowsDirectoryW( sWinDir, MAX_PATH ); + GetTempPathW(sizeof(sExamplePath)/sizeof(sExamplePath[0]), sExamplePath); + lstrcatW(sExamplePath, sExample); + CoInitialize(NULL); hr = CoCreateInstance(&CLSID_KnownFolderManager, NULL, CLSCTX_INPROC_SERVER, @@ -1136,6 +1142,59 @@ static void test_knownFolders(void) CoTaskMemFree(folders); + /* test of registering new known folders */ + bRes = CreateDirectoryW(sExamplePath, NULL); + ok(bRes, "cannot create example directory: %s\n", wine_dbgstr_w(sExamplePath)); + + ZeroMemory(&kfDefinition, sizeof(kfDefinition)); + kfDefinition.category = KF_CATEGORY_PERUSER; + kfDefinition.pszName = CoTaskMemAlloc(sizeof(sExample)); + lstrcpyW(kfDefinition.pszName, sExample); + kfDefinition.pszDescription = CoTaskMemAlloc(sizeof(sExample)); + lstrcpyW(kfDefinition.pszDescription, sExample); + kfDefinition.pszRelativePath = CoTaskMemAlloc(sizeof(sExamplePath)); + lstrcpyW(kfDefinition.pszRelativePath, sExamplePath); + + hr = IKnownFolderManager_RegisterFolder(mgr, &newFolderId, &kfDefinition); + if(hr == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED)) + win_skip("No permissions required to register custom known folder\n"); + else + { + todo_wine + ok(hr == S_OK, "failed to register known folder: 0x%08x\n", hr); + if(SUCCEEDED(hr)) + { + hr = IKnownFolderManager_GetFolder(mgr, &newFolderId, &folder); + todo_wine + ok(hr == S_OK, "failed to get known folder: 0x%08x\n", hr); + if(SUCCEEDED(hr)) + { + hr = IKnownFolder_GetId(folder, &folderId); + todo_wine + ok(hr == S_OK, "failed to get folder id: 0x%08x\n", hr); + todo_wine + ok(IsEqualGUID(&folderId, &newFolderId)==TRUE, "invalid KNOWNFOLDERID returned\n"); + + hr = IKnownFolder_GetPath(folder, 0, &folderPath); + todo_wine + ok(hr == S_OK, "failed to get path from known folder: 0x%08x\n", hr); + todo_wine + ok(lstrcmpiW(folderPath, sExamplePath)==0, "invalid known folder path retreived: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sExamplePath)); + CoTaskMemFree(folderPath); + + hr = IKnownFolder_Release(folder); + ok(hr == S_OK, "failed to release KnownFolder instance: 0x%08x\n", hr); + } + + hr = IKnownFolderManager_UnregisterFolder(mgr, &newFolderId); + todo_wine + ok(hr == S_OK, "failed to unregister folder: 0x%08x\n", hr); + } + } + FreeKnownFolderDefinitionFields(&kfDefinition); + + RemoveDirectoryW(sExamplePath); + hr = IKnownFolderManager_Release(mgr); ok(hr == S_OK, "failed to release KnownFolderManager instance: 0x%08x\n", hr); }

1 0

Mariusz Pluciński : shell32/tests: Add test of redirecting known folders.
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: da9a8a4b3d9e2f9df132502c72e3c1e3f157bbc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da9a8a4b3d9e2f9df132502c7… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Tue Jun 14 13:09:25 2011 +0200 shell32/tests: Add test of redirecting known folders. --- dlls/shell32/tests/shellpath.c | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index a506488..5e27c9e 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1039,6 +1039,7 @@ static void test_knownFolders(void) { static const WCHAR sWindows[] = {'W','i','n','d','o','w','s',0}; static const WCHAR sExample[] = {'E','x','a','m','p','l','e',0}; + static const WCHAR sExample2[] = {'E','x','a','m','p','l','e','2',0}; static const KNOWNFOLDERID newFolderId = {0x01234567, 0x89AB, 0xCDEF, {0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x01} }; HRESULT hr; IKnownFolderManager *mgr = NULL; @@ -1050,7 +1051,7 @@ static void test_knownFolders(void) UINT nCount = 0; LPWSTR folderPath; KF_REDIRECTION_CAPABILITIES redirectionCapabilities = 1; - WCHAR sWinDir[MAX_PATH], sExamplePath[MAX_PATH]; + WCHAR sWinDir[MAX_PATH], sExamplePath[MAX_PATH], sExample2Path[MAX_PATH]; BOOL bRes; GetWindowsDirectoryW( sWinDir, MAX_PATH ); @@ -1058,6 +1059,9 @@ static void test_knownFolders(void) GetTempPathW(sizeof(sExamplePath)/sizeof(sExamplePath[0]), sExamplePath); lstrcatW(sExamplePath, sExample); + GetTempPathW(sizeof(sExample2Path)/sizeof(sExample2Path[0]), sExample2Path); + lstrcatW(sExample2Path, sExample2); + CoInitialize(NULL); hr = CoCreateInstance(&CLSID_KnownFolderManager, NULL, CLSCTX_INPROC_SERVER, @@ -1145,6 +1149,8 @@ static void test_knownFolders(void) /* test of registering new known folders */ bRes = CreateDirectoryW(sExamplePath, NULL); ok(bRes, "cannot create example directory: %s\n", wine_dbgstr_w(sExamplePath)); + bRes = CreateDirectoryW(sExample2Path, NULL); + ok(bRes, "cannot create example directory: %s\n", wine_dbgstr_w(sExamplePath)); ZeroMemory(&kfDefinition, sizeof(kfDefinition)); kfDefinition.category = KF_CATEGORY_PERUSER; @@ -1182,6 +1188,32 @@ static void test_knownFolders(void) ok(lstrcmpiW(folderPath, sExamplePath)==0, "invalid known folder path retreived: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sExamplePath)); CoTaskMemFree(folderPath); + /* try to set new path for folder */ + hr = IKnownFolder_SetPath(folder, 0, sExample2Path); + todo_wine + ok(hr == S_OK, "setting path failed: 0x%0x\n", hr); + + /* verify modified path */ + hr = IKnownFolder_GetPath(folder, 0, &folderPath); + todo_wine + ok(hr == S_OK, "failed to get path from known folder: 0x%08x\n", hr); + todo_wine + ok(lstrcmpiW(folderPath, sExample2Path)==0, "invalid known folder path retreived: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sExamplePath)); + CoTaskMemFree(folderPath); + + /* set again to first path, but use another way */ + hr = IKnownFolderManager_Redirect(mgr, &newFolderId, NULL, 0, sExamplePath, 0, NULL, NULL); + todo_wine + ok(hr == S_OK, "redirection failed: 0x%08x\n", hr); + + /* again verify modified path */ + hr = IKnownFolder_GetPath(folder, 0, &folderPath); + todo_wine + ok(hr == S_OK, "failed to get path from known folder: 0x%08x\n", hr); + todo_wine + ok(lstrcmpiW(folderPath, sExamplePath)==0, "invalid known folder path retreived: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sExamplePath)); + CoTaskMemFree(folderPath); + hr = IKnownFolder_Release(folder); ok(hr == S_OK, "failed to release KnownFolder instance: 0x%08x\n", hr); } @@ -1194,6 +1226,7 @@ static void test_knownFolders(void) FreeKnownFolderDefinitionFields(&kfDefinition); RemoveDirectoryW(sExamplePath); + RemoveDirectoryW(sExample2Path); hr = IKnownFolderManager_Release(mgr); ok(hr == S_OK, "failed to release KnownFolderManager instance: 0x%08x\n", hr);

1 0

Mariusz Pluciński : shell32/tests: Add tests for SHGet /SetKnownFolderPath utilities.
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: 988db2c0c307a29e55ae0f6e0f7a40ba79b12c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=988db2c0c307a29e55ae0f6e0… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Tue Jun 14 13:09:31 2011 +0200 shell32/tests: Add tests for SHGet/SetKnownFolderPath utilities. --- dlls/shell32/tests/shellpath.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 5e27c9e..ee38e4e 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -95,6 +95,7 @@ static int (WINAPI *pSHFileOperationA)(LPSHFILEOPSTRUCTA); static HRESULT (WINAPI *pSHGetMalloc)(LPMALLOC *); static UINT (WINAPI *pGetSystemWow64DirectoryA)(LPSTR,UINT); static HRESULT (WINAPI *pSHGetKnownFolderPath)(REFKNOWNFOLDERID, DWORD, HANDLE, PWSTR *); +static HRESULT (WINAPI *pSHSetKnownFolderPath)(REFKNOWNFOLDERID, DWORD, HANDLE, PWSTR); static HRESULT (WINAPI *pSHGetFolderPathEx)(REFKNOWNFOLDERID, DWORD, HANDLE, LPWSTR, DWORD); static DLLVERSIONINFO shellVersion = { 0 }; @@ -194,6 +195,7 @@ static void loadShell32(void) GET_PROC(SHGetFolderPathEx) GET_PROC(SHGetFolderLocation) GET_PROC(SHGetKnownFolderPath) + GET_PROC(SHSetKnownFolderPath) GET_PROC(SHGetSpecialFolderPathA) GET_PROC(SHGetSpecialFolderLocation) GET_PROC(ILFindLastID) @@ -1214,6 +1216,28 @@ static void test_knownFolders(void) ok(lstrcmpiW(folderPath, sExamplePath)==0, "invalid known folder path retreived: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sExamplePath)); CoTaskMemFree(folderPath); + /* check shell utility functions */ + if(!pSHGetKnownFolderPath || !pSHSetKnownFolderPath) + todo_wine + win_skip("cannot get SHGet/SetKnownFolderPath routines\n"); + else + { + /* check shell utility functions */ + /* try to get current known folder path */ + hr = pSHGetKnownFolderPath(&newFolderId, 0, NULL, &folderPath); + ok(hr==S_OK, "cannot get known folder path: hr=0x%0x\n", hr); + ok(lstrcmpW(folderPath, sExamplePath)==0, "invalid path returned: %s\n", wine_dbgstr_w(folderPath)); + + /* set it to new value */ + hr = pSHSetKnownFolderPath(&newFolderId, 0, NULL, sExample2Path); + ok(hr==S_OK, "cannot set known folder path: hr=0x%0x\n", hr); + + /* check if it changed */ + hr = pSHGetKnownFolderPath(&newFolderId, 0, NULL, &folderPath); + ok(hr==S_OK, "cannot get known folder path: hr=0x%0x\n", hr); + ok(lstrcmpW(folderPath, sExample2Path)==0, "invalid path returned: %s\n", wine_dbgstr_w(folderPath)); + } + hr = IKnownFolder_Release(folder); ok(hr == S_OK, "failed to release KnownFolder instance: 0x%08x\n", hr); }

1 0

Rico Schüller : d3dx9: Parse resources in the effect parser.
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: 86d381a56babf2ad5c4b9a18496bdf759a253138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86d381a56babf2ad5c4b9a184… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Jun 14 11:20:43 2011 +0200 d3dx9: Parse resources in the effect parser. --- dlls/d3dx9_36/effect.c | 169 ++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 158 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ca88f76..271594c 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -85,6 +85,11 @@ enum SHADER_CONSTANT_TYPE SCT_PSINT, }; +enum STATE_TYPE +{ + ST_CONSTANT, +}; + struct d3dx_parameter { char *name; @@ -108,7 +113,7 @@ struct d3dx_state { UINT operation; UINT index; - + enum STATE_TYPE type; D3DXHANDLE parameter; }; @@ -176,7 +181,7 @@ static struct d3dx_parameter *get_parameter_by_name(struct ID3DXBaseEffectImpl * struct d3dx_parameter *parameter, LPCSTR name); static struct d3dx_parameter *get_parameter_annotation_by_name(struct d3dx_parameter *parameter, LPCSTR name); static HRESULT d3dx9_parse_state(struct d3dx_state *state, const char *data, const char **ptr, D3DXHANDLE *objects); -static void free_parameter(D3DXHANDLE handle, BOOL element, BOOL child); +static void free_parameter_state(D3DXHANDLE handle, BOOL element, BOOL child, enum STATE_TYPE st); static const struct { @@ -552,7 +557,7 @@ static struct d3dx_parameter *is_valid_parameter(struct ID3DXBaseEffectImpl *bas static void free_state(struct d3dx_state *state) { - free_parameter(state->parameter, FALSE, FALSE); + free_parameter_state(state->parameter, FALSE, FALSE, state->type); } static void free_sampler(struct d3dx_sampler *sampler) @@ -568,10 +573,16 @@ static void free_sampler(struct d3dx_sampler *sampler) static void free_parameter(D3DXHANDLE handle, BOOL element, BOOL child) { + free_parameter_state(handle, element, child, ST_CONSTANT); +} + +static void free_parameter_state(D3DXHANDLE handle, BOOL element, BOOL child, enum STATE_TYPE st) +{ unsigned int i; struct d3dx_parameter *param = get_parameter_struct(handle); - TRACE("Free parameter %p, name %s, child %s\n", param, param->name, child ? "yes" : "no"); + TRACE("Free parameter %p, name %s, type %s, child %s, state_type %x\n", param, param->name, + debug_d3dxparameter_type(param->type), child ? "yes" : "no", st); if (!param) { @@ -617,7 +628,14 @@ static void free_parameter(D3DXHANDLE handle, BOOL element, BOOL child) case D3DXPT_TEXTURECUBE: case D3DXPT_PIXELSHADER: case D3DXPT_VERTEXSHADER: - if (*(IUnknown **)param->data) IUnknown_Release(*(IUnknown **)param->data); + if (st == ST_CONSTANT) + { + if (*(IUnknown **)param->data) IUnknown_Release(*(IUnknown **)param->data); + } + else + { + HeapFree(GetProcessHeap(), 0, *(LPSTR *)param->data); + } if (!child) HeapFree(GetProcessHeap(), 0, param->data); break; @@ -626,7 +644,14 @@ static void free_parameter(D3DXHANDLE handle, BOOL element, BOOL child) case D3DXPT_SAMPLER2D: case D3DXPT_SAMPLER3D: case D3DXPT_SAMPLERCUBE: - free_sampler((struct d3dx_sampler *)param->data); + if (st == ST_CONSTANT) + { + free_sampler((struct d3dx_sampler *)param->data); + } + else + { + HeapFree(GetProcessHeap(), 0, *(LPSTR *)param->data); + } /* samplers have always own data, so free that */ HeapFree(GetProcessHeap(), 0, param->data); break; @@ -640,6 +665,10 @@ static void free_parameter(D3DXHANDLE handle, BOOL element, BOOL child) { if (!child) { + if (st != ST_CONSTANT) + { + HeapFree(GetProcessHeap(), 0, *(LPSTR *)param->data); + } HeapFree(GetProcessHeap(), 0, param->data); } } @@ -4263,6 +4292,8 @@ static HRESULT d3dx9_parse_state(struct d3dx_state *state, const char *data, con return E_OUTOFMEMORY; } + state->type = ST_CONSTANT; + read_dword(ptr, &state->operation); TRACE("Operation: %#x (%s)\n", state->operation, state_table[state->operation].name); @@ -4615,13 +4646,112 @@ err_out: return hr; } +static HRESULT d3dx9_parse_resource(struct ID3DXBaseEffectImpl *base, const char *data, const char **ptr) +{ + DWORD technique_index; + DWORD index, state_index, usage; + struct d3dx_state *state; + struct d3dx_parameter *param; + HRESULT hr; + + read_dword(ptr, &technique_index); + TRACE("techn: %u\n", technique_index); + + read_dword(ptr, &index); + TRACE("index: %u\n", index); + + skip_dword_unknown(ptr, 1); + + read_dword(ptr, &state_index); + TRACE("state: %u\n", state_index); + + read_dword(ptr, &usage); + TRACE("usage: %u\n", usage); + + if (technique_index == 0xffffffff) + { + struct d3dx_parameter *parameter; + struct d3dx_sampler *sampler; + + if (index >= base->parameter_count) + { + FIXME("Index out of bounds: index %u >= parameter_count %u\n", index, base->parameter_count); + return E_FAIL; + } + + parameter = get_parameter_struct(base->parameter_handles[index]); + sampler = parameter->data; + if (state_index >= sampler->state_count) + { + FIXME("Index out of bounds: state_index %u >= state_count %u\n", state_index, sampler->state_count); + return E_FAIL; + } + + state = &sampler->states[state_index]; + } + else + { + struct d3dx_technique *technique; + struct d3dx_pass *pass; + + if (technique_index >= base->technique_count) + { + FIXME("Index out of bounds: technique_index %u >= technique_count %u\n", technique_index, base->technique_count); + return E_FAIL; + } + + technique = get_technique_struct(base->technique_handles[technique_index]); + if (index >= technique->pass_count) + { + FIXME("Index out of bounds: index %u >= pass_count %u\n", index, technique->pass_count); + return E_FAIL; + } + + pass = get_pass_struct(technique->pass_handles[index]); + if (state_index >= pass->state_count) + { + FIXME("Index out of bounds: state_index %u >= state_count %u\n", state_index, pass->state_count); + return E_FAIL; + } + + state = &pass->states[state_index]; + } + + param = get_parameter_struct(state->parameter); + + switch (usage) + { + case 0: + TRACE("usage 0: type %s\n", debug_d3dxparameter_type(param->type)); + switch (param->type) + { + case D3DXPT_VERTEXSHADER: + case D3DXPT_PIXELSHADER: + state->type = ST_CONSTANT; + hr = d3dx9_parse_data(param, ptr, base->effect->device); + break; + + default: + FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); + break; + } + break; + + default: + FIXME("Unknown usage %x\n", usage); + break; + } + + return hr; +} + static HRESULT d3dx9_parse_effect(struct ID3DXBaseEffectImpl *base, const char *data, UINT data_size, DWORD start) { const char *ptr = data + start; D3DXHANDLE *parameter_handles = NULL; D3DXHANDLE *technique_handles = NULL; D3DXHANDLE *objects = NULL; - UINT stringcount, objectcount; + UINT stringcount, objectcount, resourcecount; HRESULT hr; UINT i; @@ -4710,10 +4840,15 @@ static HRESULT d3dx9_parse_effect(struct ID3DXBaseEffectImpl *base, const char * } } + /* needed for further parsing */ + base->technique_handles = technique_handles; + base->parameter_handles = parameter_handles; + read_dword(&ptr, &stringcount); TRACE("String count: %u\n", stringcount); - skip_dword_unknown(&ptr, 1); + read_dword(&ptr, &resourcecount); + TRACE("Resource count: %u\n", resourcecount); for (i = 0; i < stringcount; ++i) { @@ -4733,10 +4868,19 @@ static HRESULT d3dx9_parse_effect(struct ID3DXBaseEffectImpl *base, const char * } } - HeapFree(GetProcessHeap(), 0, objects); + for (i = 0; i < resourcecount; ++i) + { + TRACE("parse resource %u\n", i); - base->technique_handles = technique_handles; - base->parameter_handles = parameter_handles; + hr = d3dx9_parse_resource(base, data, &ptr); + if (hr != D3D_OK) + { + WARN("Failed to parse data\n"); + goto err_out; + } + } + + HeapFree(GetProcessHeap(), 0, objects); return D3D_OK; @@ -4760,6 +4904,9 @@ err_out: HeapFree(GetProcessHeap(), 0, parameter_handles); } + base->technique_handles = NULL; + base->parameter_handles = NULL; + HeapFree(GetProcessHeap(), 0, objects); return hr;

1 0