September 2013 - Wine-Commits

Matteo Bruni : d3dx9: Use the ID3DXInclude object to open the initial file in D3DX[ Assemble|Compile|Preprocess]ShaderFromFile.
by Alexandre Julliard Sept. 3, 2013

Sept. 3, 2013

Module: wine Branch: master Commit: 613d27ebebd30d559c6bbb7b8c233b8f59cacb28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=613d27ebebd30d559c6bbb7b8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 3 16:29:43 2013 +0200 d3dx9: Use the ID3DXInclude object to open the initial file in D3DX[Assemble|Compile|Preprocess]ShaderFromFile. --- dlls/d3dx9_36/shader.c | 64 +++++++++++++++++++++++++++++++++--------------- 1 files changed, 44 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 6edbc33..41be22c 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -306,27 +306,38 @@ HRESULT WINAPI D3DXAssembleShaderFromFileA(const char *filename, const D3DXMACRO HRESULT WINAPI D3DXAssembleShaderFromFileW(const WCHAR *filename, const D3DXMACRO *defines, ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages) { - void *buffer; + const void *buffer; DWORD len; HRESULT hr; struct D3DXIncludeImpl includefromfile; + char *filename_a; TRACE("filename %s, defines %p, include %p, flags %#x, shader %p, error_messages %p.\n", debugstr_w(filename), defines, include, flags, shader, error_messages); - if(FAILED(map_view_of_file(filename, &buffer, &len))) - return D3DXERR_INVALIDDATA; - if(!include) { includefromfile.ID3DXInclude_iface.lpVtbl = &D3DXInclude_Vtbl; include = &includefromfile.ID3DXInclude_iface; } - hr = D3DXAssembleShader(buffer, len, defines, include, flags, - shader, error_messages); + len = WideCharToMultiByte(CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL); + filename_a = HeapAlloc(GetProcessHeap(), 0, len * sizeof(char)); + if (!filename_a) + return E_OUTOFMEMORY; + WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, len, NULL, NULL); - UnmapViewOfFile(buffer); + hr = ID3DXInclude_Open(include, D3D_INCLUDE_LOCAL, filename_a, NULL, &buffer, &len); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, filename_a); + return D3DXERR_INVALIDDATA; + } + + hr = D3DXAssembleShader(buffer, len, defines, include, flags, shader, error_messages); + + ID3DXInclude_Close(include, buffer); + HeapFree(GetProcessHeap(), 0, filename_a); return hr; } @@ -425,7 +436,7 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(const WCHAR *filename, const D3DXMACRO ID3DXInclude *include, const char *entrypoint, const char *profile, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages, ID3DXConstantTable **constant_table) { - void *buffer; + const void *buffer; DWORD len, filename_len; HRESULT hr; struct D3DXIncludeImpl includefromfile; @@ -436,9 +447,6 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(const WCHAR *filename, const D3DXMACRO debugstr_w(filename), defines, include, debugstr_a(entrypoint), debugstr_a(profile), flags, shader, error_messages, constant_table); - if (FAILED(map_view_of_file(filename, &buffer, &len))) - return D3DXERR_INVALIDDATA; - if (!include) { includefromfile.ID3DXInclude_iface.lpVtbl = &D3DXInclude_Vtbl; @@ -448,12 +456,16 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(const WCHAR *filename, const D3DXMACRO filename_len = WideCharToMultiByte(CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL); filename_a = HeapAlloc(GetProcessHeap(), 0, filename_len * sizeof(char)); if (!filename_a) - { - UnmapViewOfFile(buffer); return E_OUTOFMEMORY; - } WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, filename_len, NULL, NULL); + hr = ID3DXInclude_Open(include, D3D_INCLUDE_LOCAL, filename_a, NULL, &buffer, &len); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, filename_a); + return D3DXERR_INVALIDDATA; + } + hr = D3DCompile(buffer, len, filename_a, (const D3D_SHADER_MACRO *)defines, (ID3DInclude *)include, entrypoint, profile, flags, 0, (ID3DBlob **)shader, (ID3DBlob **)error_messages); @@ -462,8 +474,8 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(const WCHAR *filename, const D3DXMACRO hr = D3DXGetShaderConstantTable(ID3DXBuffer_GetBufferPointer(*shader), constant_table); + ID3DXInclude_Close(include, buffer); HeapFree(GetProcessHeap(), 0, filename_a); - UnmapViewOfFile(buffer); return hr; } @@ -546,29 +558,41 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileA(const char *filename, const D3DXMAC HRESULT WINAPI D3DXPreprocessShaderFromFileW(const WCHAR *filename, const D3DXMACRO *defines, ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages) { - void *buffer; + const void *buffer; DWORD len; HRESULT hr; struct D3DXIncludeImpl includefromfile; + char *filename_a; TRACE("filename %s, defines %p, include %p, shader %p, error_messages %p.\n", debugstr_w(filename), defines, include, shader, error_messages); - if (FAILED(map_view_of_file(filename, &buffer, &len))) - return D3DXERR_INVALIDDATA; - if (!include) { includefromfile.ID3DXInclude_iface.lpVtbl = &D3DXInclude_Vtbl; include = &includefromfile.ID3DXInclude_iface; } + len = WideCharToMultiByte(CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL); + filename_a = HeapAlloc(GetProcessHeap(), 0, len * sizeof(char)); + if (!filename_a) + return E_OUTOFMEMORY; + WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, len, NULL, NULL); + + hr = ID3DXInclude_Open(include, D3D_INCLUDE_LOCAL, filename_a, NULL, &buffer, &len); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, filename_a); + return D3DXERR_INVALIDDATA; + } + hr = D3DPreprocess(buffer, len, NULL, (const D3D_SHADER_MACRO *)defines, (ID3DInclude *) include, (ID3DBlob **)shader, (ID3DBlob **)error_messages); - UnmapViewOfFile(buffer); + ID3DXInclude_Close(include, buffer); + HeapFree(GetProcessHeap(), 0, filename_a); return hr; }

1 0

Henri Verbeet : d3dx9: Avoid LPCVOID.
by Alexandre Julliard Sept. 3, 2013

Sept. 3, 2013

Module: wine Branch: master Commit: 76e35a293957bdeafff54436f3b82ffb8f784d39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76e35a293957bdeafff54436f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 3 09:47:25 2013 +0200 d3dx9: Avoid LPCVOID. --- dlls/d3dx9_36/d3dx9_36_private.h | 3 ++- dlls/d3dx9_36/effect.c | 8 ++++---- dlls/d3dx9_36/mesh.c | 13 +++++-------- dlls/d3dx9_36/shader.c | 7 ++++--- dlls/d3dx9_36/skin.c | 9 ++++----- dlls/d3dx9_36/tests/asm.c | 5 +++-- dlls/d3dx9_36/tests/effect.c | 12 ++++++------ dlls/d3dx9_36/tests/shader.c | 6 +++--- dlls/d3dx9_36/util.c | 8 ++++---- include/d3dx9effect.h | 8 ++++---- include/d3dx9mesh.h | 10 ++++++---- include/d3dx9shader.h | 2 +- include/d3dx9tex.h | 2 +- include/d3dx9xof.h | 4 ++-- 14 files changed, 49 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=76e35a293957bdeafff54…

1 0

Henri Verbeet : d3dx9: Avoid LPSTR.
by Alexandre Julliard Sept. 3, 2013

Sept. 3, 2013

Module: wine Branch: master Commit: 77ee90b59fd790002086e9f259b671def6a74a42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77ee90b59fd790002086e9f25… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 3 09:47:24 2013 +0200 d3dx9: Avoid LPSTR. --- dlls/d3dx9_36/effect.c | 10 +++++----- dlls/d3dx9_36/mesh.c | 14 ++++++++------ dlls/d3dx9_36/tests/mesh.c | 2 +- include/d3dx9anim.h | 4 ++-- include/d3dx9mesh.h | 6 +++--- include/d3dx9xof.h | 4 ++-- 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 5b9b05f..776c7c6 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -604,7 +604,7 @@ static void free_parameter_state(struct d3dx_parameter *param, BOOL element, BOO switch (param->type) { case D3DXPT_STRING: - HeapFree(GetProcessHeap(), 0, *(LPSTR *)param->data); + HeapFree(GetProcessHeap(), 0, *(char **)param->data); if (!child) HeapFree(GetProcessHeap(), 0, param->data); break; @@ -621,7 +621,7 @@ static void free_parameter_state(struct d3dx_parameter *param, BOOL element, BOO } else { - HeapFree(GetProcessHeap(), 0, *(LPSTR *)param->data); + HeapFree(GetProcessHeap(), 0, *(char **)param->data); } if (!child) HeapFree(GetProcessHeap(), 0, param->data); break; @@ -637,7 +637,7 @@ static void free_parameter_state(struct d3dx_parameter *param, BOOL element, BOO } else { - HeapFree(GetProcessHeap(), 0, *(LPSTR *)param->data); + HeapFree(GetProcessHeap(), 0, *(char **)param->data); } /* samplers have always own data, so free that */ HeapFree(GetProcessHeap(), 0, param->data); @@ -654,7 +654,7 @@ static void free_parameter_state(struct d3dx_parameter *param, BOOL element, BOO { if (st != ST_CONSTANT) { - HeapFree(GetProcessHeap(), 0, *(LPSTR *)param->data); + HeapFree(GetProcessHeap(), 0, *(char **)param->data); } HeapFree(GetProcessHeap(), 0, param->data); } @@ -4417,7 +4417,7 @@ static HRESULT d3dx9_parse_data(struct d3dx_parameter *param, const char **ptr, { case D3DXPT_STRING: /* re-read with size (sizeof(DWORD) = 4) */ - hr = d3dx9_parse_name((LPSTR *)param->data, *ptr - 4); + hr = d3dx9_parse_name((char **)param->data, *ptr - 4); if (hr != D3D_OK) { WARN("Failed to parse string data\n"); diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 19c92b9..a735a35 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -2638,7 +2638,7 @@ struct mesh_data { DWORD nb_bones; }; -static HRESULT parse_texture_filename(ID3DXFileData *filedata, LPSTR *filename_out) +static HRESULT parse_texture_filename(ID3DXFileData *filedata, char **filename_out) { HRESULT hr; SIZE_T data_size; @@ -2658,12 +2658,13 @@ static HRESULT parse_texture_filename(ID3DXFileData *filedata, LPSTR *filename_o if (FAILED(hr)) return hr; /* FIXME: String must be retrieved directly instead of through a pointer once ID3DXFILE is fixed */ - if (data_size < sizeof(LPSTR)) { + if (data_size < sizeof(filename_in)) + { WARN("truncated data (%lu bytes)\n", data_size); filedata->lpVtbl->Unlock(filedata); return E_FAIL; } - filename_in = *(LPSTR*)data; + filename_in = *(char **)data; filename = HeapAlloc(GetProcessHeap(), 0, strlen(filename_in) + 1); if (!filename) { @@ -3398,7 +3399,7 @@ static HRESULT generate_effects(ID3DXBuffer *materials, DWORD num_materials, for (j = 0; j < ARRAY_SIZE(material_effects); j++) { - defaults->pParamName = (LPSTR)out_ptr; + defaults->pParamName = (char *)out_ptr; strcpy(defaults->pParamName, material_effects[j].param_name); defaults->pValue = defaults->pParamName + material_effects[j].name_size; defaults->Type = D3DXEDT_FLOATS; @@ -3408,8 +3409,9 @@ static HRESULT generate_effects(ID3DXBuffer *materials, DWORD num_materials, defaults++; } - if (material_ptr->pTextureFilename) { - defaults->pParamName = (LPSTR)out_ptr; + if (material_ptr->pTextureFilename) + { + defaults->pParamName = (char *)out_ptr; strcpy(defaults->pParamName, texture_paramname); defaults->pValue = defaults->pParamName + sizeof(texture_paramname); defaults->Type = D3DXEDT_STRING; diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index a2c3709..911fe63 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1781,7 +1781,7 @@ static void check_generated_effects_(int line, const D3DXMATERIAL *materials, DW static char *strdupA(const char *p) { - LPSTR ret; + char *ret; if (!p) return NULL; ret = HeapAlloc(GetProcessHeap(), 0, strlen(p) + 1); if (ret) strcpy(ret, p); diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index 578d56d..e340328 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -92,7 +92,7 @@ typedef struct _D3DXMESHDATA typedef struct _D3DXMESHCONTAINER { - LPSTR Name; + char *Name; D3DXMESHDATA MeshData; LPD3DXMATERIAL pMaterials; LPD3DXEFFECTINSTANCE pEffects; @@ -104,7 +104,7 @@ typedef struct _D3DXMESHCONTAINER typedef struct _D3DXFRAME { - LPSTR Name; + char *Name; D3DXMATRIX TransformationMatrix; LPD3DXMESHCONTAINER pMeshContainer; struct _D3DXFRAME *pFrameSibling; diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 864be69..b71fc33 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -193,12 +193,12 @@ typedef D3DXATTRIBUTERANGE* LPD3DXATTRIBUTERANGE; typedef struct _D3DXMATERIAL { D3DMATERIAL9 MatD3D; - LPSTR pTextureFilename; + char *pTextureFilename; } D3DXMATERIAL, *LPD3DXMATERIAL; typedef struct _D3DXEFFECTDEFAULT { - LPSTR pParamName; + char *pParamName; D3DXEFFECTDEFAULTTYPE Type; DWORD NumBytes; LPVOID pValue; @@ -206,7 +206,7 @@ typedef struct _D3DXEFFECTDEFAULT typedef struct _D3DXEFFECTINSTANCE { - LPSTR pEffectFilename; + char *pEffectFilename; DWORD NumDefaults; LPD3DXEFFECTDEFAULT pDefaults; } D3DXEFFECTINSTANCE, *LPD3DXEFFECTINSTANCE; diff --git a/include/d3dx9xof.h b/include/d3dx9xof.h index ff0fc3b..b15d9da 100644 --- a/include/d3dx9xof.h +++ b/include/d3dx9xof.h @@ -110,7 +110,7 @@ DECLARE_INTERFACE_IID_(ID3DXFileSaveData,IUnknown,"cef08cfb-7b4f-4429-9624-2a690 STDMETHOD_(ULONG,Release)(THIS) PURE; /*** ID3DXFileSaveObject methods ***/ STDMETHOD(GetSave)(THIS_ ID3DXFileSaveObject **save_obj) PURE; - STDMETHOD(GetName)(THIS_ LPSTR, SIZE_T*) PURE; + STDMETHOD(GetName)(THIS_ char *name, SIZE_T *size) PURE; STDMETHOD(GetId)(THIS_ LPGUID) PURE; STDMETHOD(GetType)(THIS_ GUID*) PURE; STDMETHOD(AddDataObject)(THIS_ REFGUID template_guid, const char *name, const GUID *guid, @@ -145,7 +145,7 @@ DECLARE_INTERFACE_IID_(ID3DXFileData,IUnknown,"cef08cfd-7b4f-4429-9624-2a690a933 STDMETHOD_(ULONG,Release)(THIS) PURE; /*** ID3DXFileData methods ***/ STDMETHOD(GetEnum)(THIS_ ID3DXFileEnumObject **enum_obj) PURE; - STDMETHOD(GetName)(THIS_ LPSTR, SIZE_T*) PURE; + STDMETHOD(GetName)(THIS_ char *name, SIZE_T *size) PURE; STDMETHOD(GetId)(THIS_ LPGUID) PURE; STDMETHOD(Lock)(THIS_ SIZE_T*, LPCVOID*) PURE; STDMETHOD(Unlock)(THIS) PURE;

1 0

Nikolay Sivov : ntdll: Store 'clrClass' as COM class.
by Alexandre Julliard Sept. 3, 2013

Sept. 3, 2013

Module: wine Branch: master Commit: 8e211065a8738015e9fb7a9f3804840d59542352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e211065a8738015e9fb7a9f3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 2 11:09:08 2013 +0400 ntdll: Store 'clrClass' as COM class. --- dlls/ntdll/actctx.c | 35 +++++++++++++++++++++++------------ 1 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 8618960..369e928 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -386,6 +386,8 @@ struct entity WCHAR *clsid; WCHAR *tlbid; WCHAR *progid; + WCHAR *name; /* not NULL for clrClass */ + WCHAR *version; DWORD model; DWORD miscstatus; DWORD miscstatuscontent; @@ -411,11 +413,6 @@ struct entity { WCHAR *name; WCHAR *clsid; - } clrclass; - struct - { - WCHAR *name; - WCHAR *clsid; WCHAR *version; } clrsurrogate; } u; @@ -790,6 +787,8 @@ static void free_entity_array(struct entity_array *array) RtlFreeHeap(GetProcessHeap(), 0, entity->u.comclass.clsid); RtlFreeHeap(GetProcessHeap(), 0, entity->u.comclass.tlbid); RtlFreeHeap(GetProcessHeap(), 0, entity->u.comclass.progid); + RtlFreeHeap(GetProcessHeap(), 0, entity->u.comclass.name); + RtlFreeHeap(GetProcessHeap(), 0, entity->u.comclass.version); break; case ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION: RtlFreeHeap(GetProcessHeap(), 0, entity->u.ifaceps.iid); @@ -804,10 +803,6 @@ static void free_entity_array(struct entity_array *array) case ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION: RtlFreeHeap(GetProcessHeap(), 0, entity->u.class.name); break; - case ACTIVATION_CONTEXT_SECTION_COM_PROGID_REDIRECTION: - RtlFreeHeap(GetProcessHeap(), 0, entity->u.clrclass.name); - RtlFreeHeap(GetProcessHeap(), 0, entity->u.clrclass.clsid); - break; case ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES: RtlFreeHeap(GetProcessHeap(), 0, entity->u.clrsurrogate.name); RtlFreeHeap(GetProcessHeap(), 0, entity->u.clrsurrogate.clsid); @@ -1806,18 +1801,34 @@ static BOOL parse_clr_class_elem(xmlbuf_t* xmlbuf, struct assembly* assembly) BOOL end = FALSE, error; struct entity* entity; - entity = add_entity(&assembly->entities, ACTIVATION_CONTEXT_SECTION_COM_PROGID_REDIRECTION); + entity = add_entity(&assembly->entities, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION); if (!entity) return FALSE; while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) { if (xmlstr_cmp(&attr_name, nameW)) { - if (!(entity->u.clrclass.name = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.comclass.name = xmlstrdupW(&attr_value))) return FALSE; } else if (xmlstr_cmp(&attr_name, clsidW)) { - if (!(entity->u.clrclass.clsid = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.comclass.clsid = xmlstrdupW(&attr_value))) return FALSE; + } + else if (xmlstr_cmp(&attr_name, progidW)) + { + if (!(entity->u.comclass.progid = xmlstrdupW(&attr_value))) return FALSE; + } + else if (xmlstr_cmp(&attr_name, tlbidW)) + { + if (!(entity->u.comclass.tlbid = xmlstrdupW(&attr_value))) return FALSE; + } + else if (xmlstr_cmp(&attr_name, threadingmodelW)) + { + entity->u.comclass.model = parse_com_class_threadingmodel(&attr_value); + } + else if (xmlstr_cmp(&attr_name, runtimeVersionW)) + { + if (!(entity->u.comclass.version = xmlstrdupW(&attr_value))) return FALSE; } else {

1 0

Nikolay Sivov : ntdll: Implement compatible section for 'clrSurrogate'.
by Alexandre Julliard Sept. 3, 2013

Sept. 3, 2013

Module: wine Branch: master Commit: f0e5fd737d87286e5eb566db043501b550619b06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0e5fd737d87286e5eb566db0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 2 11:07:16 2013 +0400 ntdll: Implement compatible section for 'clrSurrogate'. --- dlls/kernel32/tests/actctx.c | 2 +- dlls/ntdll/actctx.c | 192 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 187 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f0e5fd737d87286e5eb56…

1 0

Nikolay Sivov : ntdll: Store clrSurrogate version value, added some tests.
by Alexandre Julliard Sept. 3, 2013

Sept. 3, 2013

Module: wine Branch: master Commit: 5b38a1316757730b818d0f70b52f00a2a58123e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b38a1316757730b818d0f70b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 2 11:04:17 2013 +0400 ntdll: Store clrSurrogate version value, added some tests. --- dlls/kernel32/tests/actctx.c | 82 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/actctx.c | 7 ++++ 2 files changed, 89 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index def61da..37676d2 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -93,6 +93,7 @@ DEFINE_GUID(IID_Iifaceps, 0x66666666, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0 DEFINE_GUID(IID_Ibifaceps, 0x66666666, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x57); DEFINE_GUID(IID_Iifaceps2, 0x76666666, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55); DEFINE_GUID(IID_Iifaceps3, 0x86666666, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55); +DEFINE_GUID(IID_Iiface, 0x96666666, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55); DEFINE_GUID(IID_PS32, 0x66666666, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x56); static const char manifest3[] = @@ -137,6 +138,11 @@ static const char manifest3[] = " numMethods=\"10\"" " baseInterface=\"{66666666-8888-7777-6666-555555555557}\"" " />" +" <clrSurrogate " +" clsid=\"{96666666-8888-7777-6666-555555555555}\"" +" name=\"testsurrogate\"" +" runtimeVersion=\"v2.0.50727\"" +" />" "</assembly>"; static const char manifest_wndcls1[] = @@ -1311,6 +1317,78 @@ static void test_find_ifaceps_redirection(HANDLE handle, const GUID *iid, const data.ulAssemblyRosterIndex, exid); } +struct clrsurrogate_data +{ + ULONG size; + DWORD res; + GUID clsid; + ULONG version_offset; + ULONG version_len; + ULONG name_offset; + ULONG name_len; +}; + +static void test_find_surrogate(HANDLE handle, const GUID *clsid, const WCHAR *name, const WCHAR *version, + ULONG exid, int line) +{ + struct clrsurrogate_data *surrogate; + ACTCTX_SECTION_KEYED_DATA data; + BOOL ret; + + memset(&data, 0xfe, sizeof(data)); + data.cbSize = sizeof(data); + + ret = pFindActCtxSectionGuid(0, NULL, + ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES, + clsid, &data); + if (!ret) + { + skip("surrogate sections are not supported\n"); + return; + } + ok_(__FILE__, line)(ret, "FindActCtxSectionGuid failed: %u\n", GetLastError()); + + surrogate = (struct clrsurrogate_data*)data.lpData; + + ok_(__FILE__, line)(data.cbSize == sizeof(data), "data.cbSize=%u\n", data.cbSize); + ok_(__FILE__, line)(data.ulDataFormatVersion == 1, "data.ulDataFormatVersion=%u\n", data.ulDataFormatVersion); + ok_(__FILE__, line)(data.lpData != NULL, "data.lpData == NULL\n"); + ok_(__FILE__, line)(surrogate->size == sizeof(*surrogate), "got %d for header size\n", surrogate->size); + if (data.lpData && surrogate->size == sizeof(*surrogate)) + { + WCHAR *ptrW; + ULONG len; + + ok_(__FILE__, line)(surrogate->res == 0, "invalid res value %d\n", surrogate->res); + ok_(__FILE__, line)(IsEqualGUID(&surrogate->clsid, clsid), "got wrong clsid %s\n", debugstr_guid(&surrogate->clsid)); + + ok_(__FILE__, line)(surrogate->version_len == lstrlenW(version)*sizeof(WCHAR), "got version len %d\n", surrogate->version_len); + ok_(__FILE__, line)(surrogate->version_offset == surrogate->size, "got version offset %d\n", surrogate->version_offset); + + ok_(__FILE__, line)(surrogate->name_len == lstrlenW(name)*sizeof(WCHAR), "got name len %d\n", surrogate->name_len); + ok_(__FILE__, line)(surrogate->name_offset > 0, "got name offset %d\n", surrogate->name_offset); + + len = surrogate->size + surrogate->name_len + surrogate->version_len + 2*sizeof(WCHAR); + ok_(__FILE__, line)(data.ulLength == len, "got wrong data length %d, expected %d\n", data.ulLength, len); + + ptrW = (WCHAR*)((BYTE*)surrogate + surrogate->name_offset); + ok(!lstrcmpW(ptrW, name), "got wrong name %s\n", wine_dbgstr_w(ptrW)); + + ptrW = (WCHAR*)((BYTE*)surrogate + surrogate->version_offset); + ok(!lstrcmpW(ptrW, version), "got wrong name %s\n", wine_dbgstr_w(ptrW)); + } + + ok_(__FILE__, line)(data.lpSectionGlobalData == NULL, "data.lpSectionGlobalData != NULL\n"); + ok_(__FILE__, line)(data.ulSectionGlobalDataLength == 0, "data.ulSectionGlobalDataLength=%u\n", + data.ulSectionGlobalDataLength); + ok_(__FILE__, line)(data.lpSectionBase != NULL, "data.lpSectionBase == NULL\n"); + ok_(__FILE__, line)(data.ulSectionTotalLength > 0, "data.ulSectionTotalLength=%u\n", + data.ulSectionTotalLength); + ok_(__FILE__, line)(data.hActCtx == NULL, "data.hActCtx=%p\n", data.hActCtx); + ok_(__FILE__, line)(data.ulAssemblyRosterIndex == exid, "data.ulAssemblyRosterIndex=%u, expected %u\n", + data.ulAssemblyRosterIndex, exid); +} + static void test_wndclass_section(void) { static const WCHAR cls1W[] = {'1','.','2','.','3','.','4','!','w','n','d','C','l','a','s','s','1',0}; @@ -1624,6 +1702,9 @@ static void test_actctx(void) handle = test_create("test3.manifest"); DeleteFileA("test3.manifest"); if(handle != INVALID_HANDLE_VALUE) { + static const WCHAR nameW[] = {'t','e','s','t','s','u','r','r','o','g','a','t','e',0}; + static const WCHAR versionW[] = {'v','2','.','0','.','5','0','7','2','7',0}; + test_basic_info(handle, __LINE__); test_detailed_info(handle, &detailed_info1, __LINE__); test_info_in_assembly(handle, 1, &manifest3_info, __LINE__); @@ -1634,6 +1715,7 @@ static void test_actctx(void) test_find_dll_redirection(handle, testlib_dll, 1, __LINE__); test_find_dll_redirection(handle, testlib_dll, 1, __LINE__); test_find_com_redirection(handle, &IID_CoTest, &IID_TlibTest, 1, __LINE__); + test_find_surrogate(handle, &IID_Iiface, nameW, versionW, 1, __LINE__); test_find_ifaceps_redirection(handle, &IID_Iifaceps, &IID_TlibTest4, &IID_Ibifaceps, NULL, 1, __LINE__); test_find_ifaceps_redirection(handle, &IID_Iifaceps2, &IID_TlibTest4, &IID_Ibifaceps, &IID_PS32, 1, __LINE__); test_find_ifaceps_redirection(handle, &IID_Iifaceps3, &IID_TlibTest4, &IID_Ibifaceps, NULL, 1, __LINE__); diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 6458b06..750ca50 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -393,6 +393,7 @@ struct entity { WCHAR *name; WCHAR *clsid; + WCHAR *version; } clrsurrogate; } u; }; @@ -521,6 +522,7 @@ static const WCHAR miscstatusdocprintW[] = {'m','i','s','c','S','t','a','t','u', static const WCHAR baseInterfaceW[] = {'b','a','s','e','I','n','t','e','r','f','a','c','e',0}; static const WCHAR nummethodsW[] = {'n','u','m','M','e','t','h','o','d','s',0}; static const WCHAR proxyStubClsid32W[] = {'p','r','o','x','y','S','t','u','b','C','l','s','i','d','3','2',0}; +static const WCHAR runtimeVersionW[] = {'r','u','n','t','i','m','e','V','e','r','s','i','o','n',0}; static const WCHAR activatewhenvisibleW[] = {'a','c','t','i','v','a','t','e','w','h','e','n','v','i','s','i','b','l','e',0}; static const WCHAR actslikebuttonW[] = {'a','c','t','s','l','i','k','e','b','u','t','t','o','n',0}; @@ -784,6 +786,7 @@ static void free_entity_array(struct entity_array *array) case ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES: RtlFreeHeap(GetProcessHeap(), 0, entity->u.clrsurrogate.name); RtlFreeHeap(GetProcessHeap(), 0, entity->u.clrsurrogate.clsid); + RtlFreeHeap(GetProcessHeap(), 0, entity->u.clrsurrogate.version); break; default: FIXME("Unknown entity kind %d\n", entity->kind); @@ -1819,6 +1822,10 @@ static BOOL parse_clr_surrogate_elem(xmlbuf_t* xmlbuf, struct assembly* assembly { if (!(entity->u.clrsurrogate.clsid = xmlstrdupW(&attr_value))) return FALSE; } + else if (xmlstr_cmp(&attr_name, runtimeVersionW)) + { + if (!(entity->u.clrsurrogate.version = xmlstrdupW(&attr_value))) return FALSE; + } else { WARN("unknown attr %s=%s\n", debugstr_xmlstr(&attr_name), debugstr_xmlstr(&attr_value));

1 0

Nikolay Sivov : ntdll: For typelib and COM class sections point global data to module names.
by Alexandre Julliard Sept. 3, 2013

Sept. 3, 2013

Module: wine Branch: master Commit: 44d8f6a35a1e559315b606007c162b15322477ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=44d8f6a35a1e559315b606007… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 2 11:03:19 2013 +0400 ntdll: For typelib and COM class sections point global data to module names. --- dlls/kernel32/tests/actctx.c | 13 +++++++++---- dlls/ntdll/actctx.c | 8 ++++---- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 213674a..def61da 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -1148,6 +1148,7 @@ static void test_find_com_redirection(HANDLE handle, const GUID *clsid, const GU { struct comclassredirect_data *comclass, *comclass2; ACTCTX_SECTION_KEYED_DATA data, data2; + struct guidsection_header *header; BOOL ret; memset(&data, 0xfe, sizeof(data)); @@ -1207,11 +1208,11 @@ static void test_find_com_redirection(HANDLE handle, const GUID *clsid, const GU ok_(__FILE__, line)(comclass->miscstatusdocprint != 0, "got miscstatusdocprint 0x%08x\n", comclass->miscstatusdocprint); } } -todo_wine { - ok_(__FILE__, line)(data.lpSectionGlobalData != NULL, "data.lpSectionGlobalData == NULL\n"); - ok_(__FILE__, line)(data.ulSectionGlobalDataLength > 0, "data.ulSectionGlobalDataLength=%u\n", + + header = (struct guidsection_header*)data.lpSectionBase; + ok_(__FILE__, line)(data.lpSectionGlobalData == ((BYTE*)header + header->names_offset), "data.lpSectionGlobalData == NULL\n"); + ok_(__FILE__, line)(data.ulSectionGlobalDataLength == header->names_len, "data.ulSectionGlobalDataLength=%u\n", data.ulSectionGlobalDataLength); -} ok_(__FILE__, line)(data.lpSectionBase != NULL, "data.lpSectionBase == NULL\n"); ok_(__FILE__, line)(data.ulSectionTotalLength > 0, "data.ulSectionTotalLength=%u\n", data.ulSectionTotalLength); @@ -1474,6 +1475,10 @@ static void test_typelib_section(void) ok(data.ulSectionTotalLength == data2.ulSectionTotalLength, "got %u, %u\n", data.ulSectionTotalLength, data2.ulSectionTotalLength); + ok(data.lpSectionGlobalData == ((BYTE*)section + section->names_offset), "data.lpSectionGlobalData == NULL\n"); + ok(data.ulSectionGlobalDataLength == section->names_len, "data.ulSectionGlobalDataLength=%u\n", + data.ulSectionGlobalDataLength); + /* test some actual data */ tlib = (struct tlibredirect_data*)data.lpData; ok(tlib->size == sizeof(*tlib), "got %d\n", tlib->size); diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index a172d59..6458b06 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -3294,8 +3294,8 @@ static NTSTATUS find_tlib_redirection(ACTIVATION_CONTEXT* actctx, const GUID *gu data->lpData = tlib; /* full length includes string length with nulls */ data->ulLength = tlib->size + tlib->help_len + sizeof(WCHAR); - data->lpSectionGlobalData = NULL; - data->ulSectionGlobalDataLength = 0; + data->lpSectionGlobalData = (BYTE*)actctx->tlib_section + actctx->tlib_section->names_offset; + data->ulSectionGlobalDataLength = actctx->tlib_section->names_len; data->lpSectionBase = actctx->tlib_section; data->ulSectionTotalLength = RtlSizeHeap( GetProcessHeap(), 0, actctx->tlib_section ); data->hActCtx = NULL; @@ -3517,8 +3517,8 @@ static NTSTATUS find_comserver_redirection(ACTIVATION_CONTEXT* actctx, const GUI data->lpData = comclass; /* full length includes string length with nulls */ data->ulLength = comclass->size + comclass->progid_len + sizeof(WCHAR); - data->lpSectionGlobalData = NULL; - data->ulSectionGlobalDataLength = 0; + data->lpSectionGlobalData = (BYTE*)actctx->comserver_section + actctx->comserver_section->names_offset; + data->ulSectionGlobalDataLength = actctx->comserver_section->names_len; data->lpSectionBase = actctx->comserver_section; data->ulSectionTotalLength = RtlSizeHeap( GetProcessHeap(), 0, actctx->comserver_section ); data->hActCtx = NULL;

1 0

Dmitry Timoshkov : kernel32/tests: Add a test to show that WaitCommEvent should fail if there is a pending wait .
by Alexandre Julliard Sept. 3, 2013

Sept. 3, 2013

Module: wine Branch: master Commit: 4135900235c58859fffe39290c9089151eeaf666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4135900235c58859fffe39290… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 2 18:27:01 2013 +0900 kernel32/tests: Add a test to show that WaitCommEvent should fail if there is a pending wait. --- dlls/kernel32/tests/comm.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 882b652..e54be7a 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -783,7 +783,7 @@ static void test_waittxempty(void) DWORD before, after, bytes, timediff, evtmask, errors, i; BOOL res; DWORD baud = SLOWBAUD; - OVERLAPPED ovl_write, ovl_wait; + OVERLAPPED ovl_write, ovl_wait, ovl_wait2; COMSTAT stat; hcom = test_OpenComm(TRUE); @@ -956,6 +956,16 @@ todo_wine { ok(!evtmask, "WaitCommEvent: expected 0, got %#x\n", evtmask); + S(U(ovl_wait2)).Offset = 0; + S(U(ovl_wait2)).OffsetHigh = 0; + ovl_wait2.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + SetLastError(0xdeadbeef); + res = WaitCommEvent(hcom, &evtmask, &ovl_wait2); + ok(!res, "WaitCommEvent should fail if there is a pending wait\n"); +todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + CloseHandle(ovl_wait2.hEvent); + /* unblock pending wait */ trace("recovering after WAIT_TIMEOUT...\n"); /* FIXME: Wine fails to unblock with new mask being equal to the old one */

1 0

Dmitry Timoshkov : kernel32/tests: Add a test to show that WaitCommEvent should succeed after SetCommMask( EV_TXEMPTY)+WriteFile+FlushFileBuffers.
by Alexandre Julliard Sept. 3, 2013

Sept. 3, 2013

Module: wine Branch: master Commit: 663dbd9f1c4ce1c26f07e52749a2a697fa403a05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=663dbd9f1c4ce1c26f07e5274… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 2 18:25:31 2013 +0900 kernel32/tests: Add a test to show that WaitCommEvent should succeed after SetCommMask(EV_TXEMPTY)+WriteFile+FlushFileBuffers. --- dlls/kernel32/tests/comm.c | 97 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 95 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 6970cf9..882b652 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -780,10 +780,11 @@ static void test_waittxempty(void) DCB dcb; COMMTIMEOUTS timeouts; char tbuf[]="test_waittxempty"; - DWORD before, after, bytes, timediff, evtmask; + DWORD before, after, bytes, timediff, evtmask, errors, i; BOOL res; DWORD baud = SLOWBAUD; OVERLAPPED ovl_write, ovl_wait; + COMSTAT stat; hcom = test_OpenComm(TRUE); if (hcom == INVALID_HANDLE_VALUE) return; @@ -855,7 +856,19 @@ todo_wine ok(bytes == sizeof(evtmask), "expected %u, written %u\n", (UINT)sizeof(evtmask), bytes); res = TRUE; } - else res = FALSE; + else + { + /* unblock pending wait */ + trace("recovering after WAIT_TIMEOUT...\n"); + /* FIXME: Wine fails to unblock with new mask being equal to the old one */ + res = SetCommMask(hcom, 0); + ok(res, "SetCommMask error %d\n", GetLastError()); + + res = WaitForSingleObject(ovl_wait.hEvent, TIMEOUT); + ok(res == WAIT_OBJECT_0, "WaitCommEvent failed with a timeout\n"); + + res = FALSE; + } after = GetTickCount(); todo_wine ok(res, "WaitCommEvent error %d\n", GetLastError()); @@ -876,6 +889,86 @@ todo_wine CloseHandle(ovl_write.hEvent); CloseHandle(hcom); + + for (i = 0; i < 2; i++) + { + hcom = test_OpenComm(TRUE); + if (hcom == INVALID_HANDLE_VALUE) return; + + res = SetCommMask(hcom, EV_TXEMPTY); + ok(res, "SetCommMask error %d\n", GetLastError()); + + if (i == 0) + { + S(U(ovl_write)).Offset = 0; + S(U(ovl_write)).OffsetHigh = 0; + ovl_write.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + before = GetTickCount(); + SetLastError(0xdeadbeef); + res = WriteFile(hcom, tbuf, sizeof(tbuf), &bytes, &ovl_write); +todo_wine + ok(!res && GetLastError() == ERROR_IO_PENDING, "WriteFile returned %d, error %d\n", res, GetLastError()); +todo_wine + ok(!bytes, "expected 0, got %u\n", bytes); + + ClearCommError(hcom, &errors, &stat); + ok(stat.cbInQue == 0, "InQueue should be empty, got %d bytes\n", stat.cbInQue); + ok(stat.cbOutQue != 0 || broken(stat.cbOutQue == 0) /* VM */, "OutQueue should not be empty\n"); + ok(errors == 0, "ClearCommErrors: Unexpected error 0x%08x\n", errors); + + res = GetOverlappedResult(hcom, &ovl_write, &bytes, TRUE); + ok(res, "GetOverlappedResult reported error %d\n", GetLastError()); + ok(bytes == sizeof(tbuf), "expected %u, written %u\n", (UINT)sizeof(tbuf), bytes); + CloseHandle(ovl_write.hEvent); + + res = FlushFileBuffers(hcom); + ok(res, "FlushFileBuffers error %d\n", GetLastError()); + } + + ClearCommError(hcom, &errors, &stat); + ok(stat.cbInQue == 0, "InQueue should be empty, got %d bytes\n", stat.cbInQue); + ok(stat.cbOutQue == 0, "OutQueue should be empty, got %d bytes\n", stat.cbOutQue); + ok(errors == 0, "ClearCommErrors: Unexpected error 0x%08x\n", errors); + + S(U(ovl_wait)).Offset = 0; + S(U(ovl_wait)).OffsetHigh = 0; + ovl_wait.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + evtmask = 0; + SetLastError(0xdeadbeef); + res = WaitCommEvent(hcom, &evtmask, &ovl_wait); + ok(!res && GetLastError() == ERROR_IO_PENDING, "%d: WaitCommEvent error %d\n", i, GetLastError()); + + res = WaitForSingleObject(ovl_wait.hEvent, TIMEOUT); + if (i == 0) +todo_wine + ok(res == WAIT_OBJECT_0, "WaitCommEvent failed with a timeout\n"); + else + ok(res == WAIT_TIMEOUT, "WaitCommEvent should fail with a timeout\n"); + if (res == WAIT_OBJECT_0) + { + res = GetOverlappedResult(hcom, &ovl_wait, &bytes, FALSE); + ok(res, "GetOverlappedResult reported error %d\n", GetLastError()); + ok(bytes == sizeof(evtmask), "expected %u, written %u\n", (UINT)sizeof(evtmask), bytes); + ok(res, "WaitCommEvent error %d\n", GetLastError()); + ok(evtmask & EV_TXEMPTY, "WaitCommEvent: expected EV_TXEMPTY, got %#x\n", evtmask); + } + else + { + ok(!evtmask, "WaitCommEvent: expected 0, got %#x\n", evtmask); + + /* unblock pending wait */ + trace("recovering after WAIT_TIMEOUT...\n"); + /* FIXME: Wine fails to unblock with new mask being equal to the old one */ + res = SetCommMask(hcom, 0); + ok(res, "SetCommMask error %d\n", GetLastError()); + + res = WaitForSingleObject(ovl_wait.hEvent, TIMEOUT); + ok(res == WAIT_OBJECT_0, "WaitCommEvent failed with a timeout\n"); + CloseHandle(ovl_wait.hEvent); + } + + CloseHandle(hcom); + } } /* A new open handle should not return error or have bytes in the Queues */

1 0

Michael Stefaniuc : avifil32: Move the IAVIStream vtbl to avoid forward declarations.
by Alexandre Julliard Sept. 3, 2013

Sept. 3, 2013

Module: wine Branch: master Commit: 11b21f70ab9032dd9990227f413292cadb39189d URL: http://source.winehq.org/git/wine.git/?a=commit;h=11b21f70ab9032dd9990227f4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Sep 2 22:22:50 2013 +0200 avifil32: Move the IAVIStream vtbl to avoid forward declarations. --- dlls/avifil32/avifile.c | 50 ++++++++++++++++------------------------------- 1 files changed, 17 insertions(+), 33 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 854d490..2711ba4 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -55,38 +55,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(avifile); #define IDX_PER_BLOCK 2730 #endif -static HRESULT WINAPI IAVIStream_fnQueryInterface(IAVIStream*iface,REFIID refiid,LPVOID *obj); -static ULONG WINAPI IAVIStream_fnAddRef(IAVIStream*iface); -static ULONG WINAPI IAVIStream_fnRelease(IAVIStream* iface); -static HRESULT WINAPI IAVIStream_fnCreate(IAVIStream*iface,LPARAM lParam1,LPARAM lParam2); -static HRESULT WINAPI IAVIStream_fnInfo(IAVIStream*iface,AVISTREAMINFOW *psi,LONG size); -static LONG WINAPI IAVIStream_fnFindSample(IAVIStream*iface,LONG pos,LONG flags); -static HRESULT WINAPI IAVIStream_fnReadFormat(IAVIStream*iface,LONG pos,LPVOID format,LONG *formatsize); -static HRESULT WINAPI IAVIStream_fnSetFormat(IAVIStream*iface,LONG pos,LPVOID format,LONG formatsize); -static HRESULT WINAPI IAVIStream_fnRead(IAVIStream*iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,LONG *bytesread,LONG *samplesread); -static HRESULT WINAPI IAVIStream_fnWrite(IAVIStream*iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,DWORD flags,LONG *sampwritten,LONG *byteswritten); -static HRESULT WINAPI IAVIStream_fnDelete(IAVIStream*iface,LONG start,LONG samples); -static HRESULT WINAPI IAVIStream_fnReadData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG *lpread); -static HRESULT WINAPI IAVIStream_fnWriteData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG size); -static HRESULT WINAPI IAVIStream_fnSetInfo(IAVIStream*iface,AVISTREAMINFOW*info,LONG infolen); - -static const struct IAVIStreamVtbl avist_vt = { - IAVIStream_fnQueryInterface, - IAVIStream_fnAddRef, - IAVIStream_fnRelease, - IAVIStream_fnCreate, - IAVIStream_fnInfo, - IAVIStream_fnFindSample, - IAVIStream_fnReadFormat, - IAVIStream_fnSetFormat, - IAVIStream_fnRead, - IAVIStream_fnWrite, - IAVIStream_fnDelete, - IAVIStream_fnReadData, - IAVIStream_fnWriteData, - IAVIStream_fnSetInfo -}; - typedef struct _IAVIFileImpl IAVIFileImpl; typedef struct _IAVIStreamImpl { @@ -1346,7 +1314,23 @@ static HRESULT WINAPI IAVIStream_fnSetInfo(IAVIStream *iface, AVISTREAMINFOW *in return E_FAIL; } -/***********************************************************************/ +static const struct IAVIStreamVtbl avist_vt = { + IAVIStream_fnQueryInterface, + IAVIStream_fnAddRef, + IAVIStream_fnRelease, + IAVIStream_fnCreate, + IAVIStream_fnInfo, + IAVIStream_fnFindSample, + IAVIStream_fnReadFormat, + IAVIStream_fnSetFormat, + IAVIStream_fnRead, + IAVIStream_fnWrite, + IAVIStream_fnDelete, + IAVIStream_fnReadData, + IAVIStream_fnWriteData, + IAVIStream_fnSetInfo +}; + static HRESULT AVIFILE_AddFrame(IAVIStreamImpl *This, DWORD ckid, DWORD size, DWORD offset, DWORD flags) {

1 0