wine-commits March 2009

wine-commits@winehq.org

2 participants
834 discussions

Henri Verbeet : bcrypt: Add a mostly empty bcrypt.dll.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 5c8985002f76928cea3be36f1586e5209921ba71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8985002f76928cea3be36f1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 30 11:24:55 2009 +0200 bcrypt: Add a mostly empty bcrypt.dll. This is the "Cryptography API: Next Generation" introduced by Vista. --- configure | 9 +++++++ configure.ac | 1 + dlls/bcrypt/Makefile.in | 15 +++++++++++ dlls/bcrypt/bcrypt.spec | 58 +++++++++++++++++++++++++++++++++++++++++++++ dlls/bcrypt/bcrypt_main.c | 40 +++++++++++++++++++++++++++++++ dlls/bcrypt/version.rc | 26 ++++++++++++++++++++ 6 files changed, 149 insertions(+), 0 deletions(-) diff --git a/configure b/configure index eb66b54..7812661 100755 --- a/configure +++ b/configure @@ -24413,6 +24413,14 @@ dlls/avifile.dll16/Makefile: dlls/avifile.dll16/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/avifile.dll16/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/bcrypt/Makefile" +test "x$enable_bcrypt" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + bcrypt" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/bcrypt/Makefile: dlls/bcrypt/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/bcrypt/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/browseui/Makefile" test "x$enable_browseui" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ browseui" @@ -28883,6 +28891,7 @@ do "dlls/avicap32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/avicap32/Makefile" ;; "dlls/avifil32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/avifil32/Makefile" ;; "dlls/avifile.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/avifile.dll16/Makefile" ;; + "dlls/bcrypt/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/bcrypt/Makefile" ;; "dlls/browseui/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/browseui/Makefile" ;; "dlls/browseui/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/browseui/tests/Makefile" ;; "dlls/cabinet/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cabinet/Makefile" ;; diff --git a/configure.ac b/configure.ac index 9c90bff..c33980f 100644 --- a/configure.ac +++ b/configure.ac @@ -1883,6 +1883,7 @@ WINE_CONFIG_MAKEFILE([dlls/authz/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_ WINE_CONFIG_MAKEFILE([dlls/avicap32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/avifil32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/avifile.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) +WINE_CONFIG_MAKEFILE([dlls/bcrypt/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/browseui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/browseui/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/cabinet/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/bcrypt/Makefile.in b/dlls/bcrypt/Makefile.in new file mode 100644 index 0000000..ec26227 --- /dev/null +++ b/dlls/bcrypt/Makefile.in @@ -0,0 +1,15 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = bcrypt.dll +IMPORTS = kernel32 + +C_SRCS = \ + bcrypt_main.c + +RC_SRCS = version.rc + +@MAKE_DLL_RULES@ + +@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec new file mode 100644 index 0000000..7d85e12 --- /dev/null +++ b/dlls/bcrypt/bcrypt.spec @@ -0,0 +1,58 @@ +@ stub BCryptAddContextFunction +@ stub BCryptAddContextFunctionProvider +@ stub BCryptCloseAlgorithmProvider +@ stub BCryptConfigureContext +@ stub BCryptConfigureContextFunction +@ stub BCryptCreateContext +@ stub BCryptCreateHash +@ stub BCryptDecrypt +@ stub BCryptDeleteContext +@ stub BCryptDeriveKey +@ stub BCryptDestroyHash +@ stub BCryptDestroyKey +@ stub BCryptDestroySecret +@ stub BCryptDuplicateHash +@ stub BCryptDuplicateKey +@ stub BCryptEncrypt +@ stub BCryptEnumAlgorithms +@ stub BCryptEnumContextFunctionProviders +@ stub BCryptEnumContextFunctions +@ stub BCryptEnumContexts +@ stub BCryptEnumProviders +@ stub BCryptEnumRegisteredProviders +@ stub BCryptExportKey +@ stub BCryptFinalizeKeyPair +@ stub BCryptFinishHash +@ stub BCryptFreeBuffer +@ stub BCryptGenRandom +@ stub BCryptGenerateKeyPair +@ stub BCryptGenerateSymmetricKey +@ stub BCryptGetFipsAlgorithmMode +@ stub BCryptGetProperty +@ stub BCryptHashData +@ stub BCryptImportKey +@ stub BCryptImportKeyPair +@ stub BCryptOpenAlgorithmProvider +@ stub BCryptQueryContextConfiguration +@ stub BCryptQueryContextFunctionConfiguration +@ stub BCryptQueryContextFunctionProperty +@ stub BCryptQueryProviderRegistration +@ stub BCryptRegisterConfigChangeNotify +@ stub BCryptRegisterProvider +@ stub BCryptRemoveContextFunction +@ stub BCryptRemoveContextFunctionProvider +@ stub BCryptResolveProviders +@ stub BCryptSecretAgreement +@ stub BCryptSetAuditingInterface +@ stub BCryptSetContextFunctionProperty +@ stub BCryptSetProperty +@ stub BCryptSignHash +@ stub BCryptUnregisterConfigChangeNotify +@ stub BCryptUnregisterProvider +@ stub BCryptVerifySignature +@ stub GetAsymmetricEncryptionInterface +@ stub GetCipherInterface +@ stub GetHashInterface +@ stub GetRngInterface +@ stub GetSecretAgreementInterface +@ stub GetSignatureInterface diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c new file mode 100644 index 0000000..abe9750 --- /dev/null +++ b/dlls/bcrypt/bcrypt_main.c @@ -0,0 +1,40 @@ +/* + * Copyright 2009 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include "wine/port.h" +#include "wine/debug.h" + +#include "winbase.h" + +WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); + +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +{ + TRACE("fdwReason %u\n", fdwReason); + + switch(fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + } + + return TRUE; +} diff --git a/dlls/bcrypt/version.rc b/dlls/bcrypt/version.rc new file mode 100644 index 0000000..54253a9 --- /dev/null +++ b/dlls/bcrypt/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2009 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Crypto Library" +#define WINE_FILENAME_STR "bcrypt.dll" +#define WINE_FILEVERSION 6,0,6000,16386 +#define WINE_FILEVERSION_STR "6.0.6000.16386" +#define WINE_PRODUCTVERSION 6,0,6000,16386 +#define WINE_PRODUCTVERSION_STR "6.0.6000.16386" + +#include "wine/wine_common_ver.rc"

1 0

Henri Verbeet : d3d10core: Create a vertex declaration from the input layout.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: ec0370a2d297e6436a4364d81c16c5ff86cc1684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec0370a2d297e6436a4364d81… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 30 11:24:55 2009 +0200 d3d10core: Create a vertex declaration from the input layout. --- dlls/d3d10core/d3d10core_private.h | 9 ++- dlls/d3d10core/device.c | 23 +++++- dlls/d3d10core/inputlayout.c | 139 ++++++++++++++++++++++++++++++++++++ 3 files changed, 167 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index ff723ba..df9794f 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Henri Verbeet for CodeWeavers + * Copyright 2008-2009 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -38,6 +38,7 @@ ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \ ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) #define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') +#define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') /* TRACE helper functions */ const char *debug_d3d10_primitive_topology(D3D10_PRIMITIVE_TOPOLOGY topology); @@ -118,8 +119,14 @@ struct d3d10_input_layout { const struct ID3D10InputLayoutVtbl *vtbl; LONG refcount; + + IWineD3DVertexDeclaration *wined3d_decl; }; +HRESULT d3d10_input_layout_to_wined3d_declaration(const D3D10_INPUT_ELEMENT_DESC *element_descs, + UINT element_count, const void *shader_byte_code, SIZE_T shader_byte_code_length, + WINED3DVERTEXELEMENT **wined3d_elements, UINT *wined3d_element_count); + /* ID3D10VertexShader */ extern const struct ID3D10VertexShaderVtbl d3d10_vertex_shader_vtbl; struct d3d10_vertex_shader diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 7320f92..ff31b53 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1,5 +1,5 @@ /* - * Copyright 2008 Henri Verbeet for CodeWeavers + * Copyright 2008-2009 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -909,10 +909,14 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateInputLayout(ID3D10Device *if const D3D10_INPUT_ELEMENT_DESC *element_descs, UINT element_count, const void *shader_byte_code, SIZE_T shader_byte_code_length, ID3D10InputLayout **input_layout) { + struct d3d10_device *This = (struct d3d10_device *)iface; struct d3d10_input_layout *object; + WINED3DVERTEXELEMENT *wined3d_elements; + UINT wined3d_element_count; + HRESULT hr; - FIXME("iface %p, element_descs %p, element_count %u, shader_byte_code %p," - "\tshader_byte_code_length %lu, input_layout %p stub!\n", + TRACE("iface %p, element_descs %p, element_count %u, shader_byte_code %p," + "\tshader_byte_code_length %lu, input_layout %p\n", iface, element_descs, element_count, shader_byte_code, shader_byte_code_length, input_layout); @@ -926,6 +930,19 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateInputLayout(ID3D10Device *if object->vtbl = &d3d10_input_layout_vtbl; object->refcount = 1; + hr = d3d10_input_layout_to_wined3d_declaration(element_descs, element_count, + shader_byte_code, shader_byte_code_length, &wined3d_elements, &wined3d_element_count); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + IWineD3DDevice_CreateVertexDeclaration(This->wined3d_device, &object->wined3d_decl, + (IUnknown *)object, wined3d_elements, wined3d_element_count); + + HeapFree(GetProcessHeap(), 0, wined3d_elements); + *input_layout = (ID3D10InputLayout *)object; return S_OK; diff --git a/dlls/d3d10core/inputlayout.c b/dlls/d3d10core/inputlayout.c index 034a642..d78ecad 100644 --- a/dlls/d3d10core/inputlayout.c +++ b/dlls/d3d10core/inputlayout.c @@ -24,6 +24,144 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); +struct input_signature_element +{ + const char *semantic_name; + UINT semantic_idx; + DWORD unknown; /* system value semantic? */ + DWORD component_type; + UINT register_idx; + DWORD mask; +}; + +struct input_signature +{ + struct input_signature_element *elements; + UINT element_count; +}; + +static HRESULT parse_isgn(const char *data, struct input_signature *is) +{ + struct input_signature_element *e; + const char *ptr = data; + unsigned int i; + DWORD count; + + read_dword(&ptr, &count); + TRACE("%u elements\n", count); + + skip_dword_unknown(&ptr, 1); + + e = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*e)); + if (!e) + { + ERR("Failed to allocate input signature memory.\n"); + return E_OUTOFMEMORY; + } + + for (i = 0; i < count; ++i) + { + UINT name_offset; + + read_dword(&ptr, &name_offset); + e[i].semantic_name = data + name_offset; + read_dword(&ptr, &e[i].semantic_idx); + read_dword(&ptr, &e[i].unknown); + read_dword(&ptr, &e[i].component_type); + read_dword(&ptr, &e[i].register_idx); + read_dword(&ptr, &e[i].mask); + + TRACE("semantic: %s, semantic idx: %u, unknown %#x, type %u, register idx: %u, use_mask %#x, input_mask %#x\n", + e[i].semantic_name, e[i].semantic_idx, e[i].unknown, e[i].component_type, + e[i].register_idx, (e[i].mask >> 8) & 0xff, e[i].mask & 0xff); + } + + is->elements = e; + is->element_count = count; + + return S_OK; +} + +static HRESULT isgn_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) +{ + struct input_signature *is = ctx; + const char *ptr = data; + char tag_str[5]; + + switch(tag) + { + case TAG_ISGN: + return parse_isgn(ptr, is); + + default: + memcpy(tag_str, &tag, 4); + tag_str[4] = '\0'; + FIXME("Unhandled chunk %s\n", tag_str); + return S_OK; + } +} + +HRESULT d3d10_input_layout_to_wined3d_declaration(const D3D10_INPUT_ELEMENT_DESC *element_descs, + UINT element_count, const void *shader_byte_code, SIZE_T shader_byte_code_length, + WINED3DVERTEXELEMENT **wined3d_elements, UINT *wined3d_element_count) +{ + struct input_signature is; + HRESULT hr; + UINT i; + + hr = parse_dxbc(shader_byte_code, shader_byte_code_length, isgn_handler, &is); + if (FAILED(hr)) + { + ERR("Failed to parse input signature.\n"); + return E_FAIL; + } + + *wined3d_elements = HeapAlloc(GetProcessHeap(), 0, element_count * sizeof(**wined3d_elements)); + if (!*wined3d_elements) + { + ERR("Failed to allocate wined3d vertex element array memory.\n"); + HeapFree(GetProcessHeap(), 0, is.elements); + return E_OUTOFMEMORY; + } + *wined3d_element_count = 0; + + for (i = 0; i < element_count; ++i) + { + UINT j; + + for (j = 0; j < is.element_count; ++j) + { + if (!strcmp(element_descs[i].SemanticName, is.elements[j].semantic_name) + && element_descs[i].SemanticIndex == is.elements[j].semantic_idx) + { + WINED3DVERTEXELEMENT *e = &(*wined3d_elements)[(*wined3d_element_count)++]; + const D3D10_INPUT_ELEMENT_DESC *f = &element_descs[i]; + + e->format = wined3dformat_from_dxgi_format(f->Format); + e->input_slot = f->InputSlot; + e->offset = f->AlignedByteOffset; + e->output_slot = is.elements[j].register_idx; + e->method = WINED3DDECLMETHOD_DEFAULT; + e->usage = 0; + e->usage_idx = 0; + + if (f->AlignedByteOffset == D3D10_APPEND_ALIGNED_ELEMENT) + FIXME("D3D10_APPEND_ALIGNED_ELEMENT not supported\n"); + if (f->InputSlotClass != D3D10_INPUT_PER_VERTEX_DATA) + FIXME("Ignoring input slot class (%#x)\n", f->InputSlotClass); + if (f->InstanceDataStepRate) + FIXME("Ignoring instace data step rate (%#x)\n", f->InstanceDataStepRate); + + break; + } + } + } + + HeapFree(GetProcessHeap(), 0, is.elements); + + return S_OK; +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE d3d10_input_layout_QueryInterface(ID3D10InputLayout *iface, @@ -65,6 +203,7 @@ static ULONG STDMETHODCALLTYPE d3d10_input_layout_Release(ID3D10InputLayout *ifa if (!refcount) { + IWineD3DVertexDeclaration_Release(This->wined3d_decl); HeapFree(GetProcessHeap(), 0, This); }

1 0

Henri Verbeet : d3d10core: Add a DXBC parser.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 7c3fa5d76d1de49842f791a94bf329182d7bc275 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c3fa5d76d1de49842f791a94… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 30 11:24:54 2009 +0200 d3d10core: Add a DXBC parser. We may want to push this into either wined3d or our future shader compiler dll. It's not a whole lot of code though. --- dlls/d3d10core/d3d10core_private.h | 23 +++++++++++++ dlls/d3d10core/utils.c | 65 ++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 9703821..ff723ba 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -34,6 +34,11 @@ #include "wine/wined3d.h" #include "wine/winedxgi.h" +#define MAKE_TAG(ch0, ch1, ch2, ch3) \ + ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \ + ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) +#define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') + /* TRACE helper functions */ const char *debug_d3d10_primitive_topology(D3D10_PRIMITIVE_TOPOLOGY topology); const char *debug_dxgi_format(DXGI_FORMAT format); @@ -41,6 +46,24 @@ const char *debug_dxgi_format(DXGI_FORMAT format); DXGI_FORMAT dxgi_format_from_wined3dformat(WINED3DFORMAT format); WINED3DFORMAT wined3dformat_from_dxgi_format(DXGI_FORMAT format); +static inline void read_dword(const char **ptr, DWORD *d) +{ + memcpy(d, *ptr, sizeof(*d)); + *ptr += sizeof(*d); +} + +void skip_dword_unknown(const char **ptr, unsigned int count); + +static inline void read_tag(const char **ptr, DWORD *t, char t_str[5]) +{ + read_dword(ptr, t); + memcpy(t_str, t, 4); + t_str[4] = '\0'; +} + +HRESULT parse_dxbc(const char *data, SIZE_T data_size, + HRESULT (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx); + /* IDirect3D10Device */ extern const struct ID3D10DeviceVtbl d3d10_device_vtbl; extern const struct IUnknownVtbl d3d10_device_inner_unknown_vtbl; diff --git a/dlls/d3d10core/utils.c b/dlls/d3d10core/utils.c index b3e5fef..29f1e7a 100644 --- a/dlls/d3d10core/utils.c +++ b/dlls/d3d10core/utils.c @@ -344,3 +344,68 @@ WINED3DFORMAT wined3dformat_from_dxgi_format(DXGI_FORMAT format) return WINED3DFMT_UNKNOWN; } } + +void skip_dword_unknown(const char **ptr, unsigned int count) +{ + unsigned int i; + DWORD d; + + FIXME("Skipping %u unknown DWORDs:\n", count); + for (i = 0; i < count; ++i) + { + read_dword(ptr, &d); + FIXME("\t0x%08x\n", d); + } +} + +HRESULT parse_dxbc(const char *data, SIZE_T data_size, + HRESULT (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx) +{ + const char *ptr = data; + HRESULT hr = S_OK; + DWORD chunk_count; + DWORD total_size; + char tag_str[5]; + unsigned int i; + DWORD tag; + + read_tag(&ptr, &tag, tag_str); + TRACE("tag: %s\n", tag_str); + + if (tag != TAG_DXBC) + { + WARN("Wrong tag.\n"); + return E_FAIL; + } + + /* checksum? */ + skip_dword_unknown(&ptr, 4); + + skip_dword_unknown(&ptr, 1); + + read_dword(&ptr, &total_size); + TRACE("total size: %#x\n", total_size); + + read_dword(&ptr, &chunk_count); + TRACE("chunk count: %#x\n", chunk_count); + + for (i = 0; i < chunk_count; ++i) + { + DWORD chunk_tag, chunk_size; + const char *chunk_ptr; + DWORD chunk_offset; + + read_dword(&ptr, &chunk_offset); + TRACE("chunk %u at offset %#x\n", i, chunk_offset); + + chunk_ptr = data + chunk_offset; + + read_dword(&chunk_ptr, &chunk_tag); + read_dword(&chunk_ptr, &chunk_size); + + hr = chunk_handler(chunk_ptr, chunk_size, chunk_tag, ctx); + if (FAILED(hr)) break; + } + + return hr; +}

1 0

Henri Verbeet : wined3d: Use the output slot when we have one.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 1205c33c90ed493fd26fc4bc102d55b8df28d9b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1205c33c90ed493fd26fc4bc1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 30 11:24:54 2009 +0200 wined3d: Use the output slot when we have one. --- dlls/wined3d/device.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 84f216a..5d3f400 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -250,7 +250,19 @@ void device_stream_info_from_declaration(IWineD3DDeviceImpl *This, if (use_vshader) { - stride_used = vshader_get_input(This->stateBlock->vertexShader, element->usage, element->usage_idx, &idx); + if (element->output_slot == ~0U) + { + /* TODO: Assuming vertexdeclarations are usually used with the + * same or a similar shader, it might be worth it to store the + * last used output slot and try that one first. */ + stride_used = vshader_get_input(This->stateBlock->vertexShader, + element->usage, element->usage_idx, &idx); + } + else + { + idx = element->output_slot; + stride_used = TRUE; + } } else {

1 0

Henri Verbeet : wined3d: Store the format_desc itself in struct wined3d_stream_info_element.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: ef2d70418383f03c6bf701caeb67129acc6d2453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef2d70418383f03c6bf701cae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 30 11:24:54 2009 +0200 wined3d: Store the format_desc itself in struct wined3d_stream_info_element. --- dlls/wined3d/buffer.c | 11 ++++++----- dlls/wined3d/device.c | 18 +++--------------- dlls/wined3d/drawprim.c | 24 ++++++++++++------------ dlls/wined3d/state.c | 36 +++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 10 ++-------- 5 files changed, 42 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef2d70418383f03c6bf70…

1 0

Ge van Geldorp : shdocvw/tests: Fix shdocvw: webbrowser test on some Windows boxes.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 8968f5fa0908376f690a55802eae48d4c5dcd1c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8968f5fa0908376f690a55802… Author: Ge van Geldorp <ge(a)gse.nl> Date: Mon Mar 30 00:42:31 2009 +0200 shdocvw/tests: Fix shdocvw:webbrowser test on some Windows boxes. --- dlls/shdocvw/tests/webbrowser.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 187ac49..fe7df89 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -279,8 +279,15 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID default: ok(0, "unexpected nCmdID %d\n", nCmdID); } + }else if(IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup)) { + switch(nCmdID) { + case 105: /* TODO */ + return E_FAIL; + default: + ok(0, "unexpected nCmdID %d\n", nCmdID); + } }else { - ok(0, "unepected pguidCmdGroup %s\n", debugstr_guid(pguidCmdGroup)); + ok(0, "unexpected pguidCmdGroup %s\n", debugstr_guid(pguidCmdGroup)); } return E_FAIL;

1 0

Ge van Geldorp : urlmon/tests: Fix ftp protocol test on WinXP and higher.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 6d238a6f5178fd470fd04a5a0f09bb1636de0ea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d238a6f5178fd470fd04a5a0… Author: Ge van Geldorp <ge(a)gse.nl> Date: Mon Mar 30 00:41:54 2009 +0200 urlmon/tests: Fix ftp protocol test on WinXP and higher. --- dlls/urlmon/tests/protocol.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 9a488c0..c87c7fb 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -352,7 +352,10 @@ static HRESULT WINAPI ProtocolSink_Switch(IInternetProtocolSink *iface, PROTOCOL { HRESULT hres; - CHECK_EXPECT(Switch); + if(tested_protocol == FTP_TEST) + CHECK_EXPECT2(Switch); + else + CHECK_EXPECT(Switch); ok(pProtocolData != NULL, "pProtocolData == NULL\n"); pdata = pProtocolData; @@ -1835,23 +1838,19 @@ static void test_ftp_protocol(void) (hres == S_OK && cb==1), "Read failed: %08x (%d bytes)\n", hres, cb); WaitForSingleObject(event_complete, INFINITE); - CHECK_CALLED(Switch); while(1) { - SET_EXPECT(Switch); hres = IInternetProtocol_Read(async_protocol, buf, sizeof(buf), &cb); - if(hres == E_PENDING) { + if(hres == E_PENDING) WaitForSingleObject(event_complete, INFINITE); - CHECK_CALLED(Switch); - }else { - CHECK_NOT_CALLED(Switch); + else if(cb == 0) break; - } } ok(hres == S_FALSE, "Read failed: %08x\n", hres); CHECK_CALLED(ReportResult); + CHECK_CALLED(Switch); test_protocol_terminate(async_protocol);

1 0

Roderick Colenbrander : wined3d: Check for the presence of wglGetExtensionsStringARB.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 5d08f3b7051c5b09eedff2ca4365faccc02ce8b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d08f3b7051c5b09eedff2ca4… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Mar 29 22:08:42 2009 +0200 wined3d: Check for the presence of wglGetExtensionsStringARB. --- dlls/wined3d/directx.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index aee4efe..3294fff 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1405,12 +1405,14 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { /* Make sure there's an active HDC else the WGL extensions will fail */ hdc = pwglGetCurrentDC(); if (hdc) { - WGL_Extensions = GL_EXTCALL(wglGetExtensionsStringARB(hdc)); - TRACE_(d3d_caps)("WGL_Extensions reported:\n"); + /* Not all GL drivers might offer WGL extensions e.g. VirtualBox */ + if(GL_EXTCALL(wglGetExtensionsStringARB)) + WGL_Extensions = GL_EXTCALL(wglGetExtensionsStringARB(hdc)); if (NULL == WGL_Extensions) { ERR(" WGL_Extensions returns NULL\n"); } else { + TRACE_(d3d_caps)("WGL_Extensions reported:\n"); while (*WGL_Extensions != 0x00) { const char *Start; char ThisExtn[256];

1 0

Jacek Caban : urlmon: Get rid of ICOM_THIS_MULTI macro.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 74e0072dfd28eabc3a61c1c63973cd1927134936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74e0072dfd28eabc3a61c1c63… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 29 21:31:27 2009 +0200 urlmon: Get rid of ICOM_THIS_MULTI macro. --- dlls/urlmon/format.c | 18 ++++++++++-------- dlls/urlmon/urlmon_main.h | 1 - 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/urlmon/format.c b/dlls/urlmon/format.c index 0c87ca5..bf9dda0 100644 --- a/dlls/urlmon/format.c +++ b/dlls/urlmon/format.c @@ -35,11 +35,13 @@ typedef struct { static IEnumFORMATETC *EnumFORMATETC_Create(UINT cfmtetc, const FORMATETC *rgfmtetc, UINT it); -#define ENUMF_THIS(iface) ICOM_THIS_MULTI(EnumFORMATETC, lpEnumFORMATETCVtbl, iface) +#define ENUMF_THIS(iface) DEFINE_THIS(EnumFORMATETC, EnumFORMATETC, iface) static HRESULT WINAPI EnumFORMATETC_QueryInterface(IEnumFORMATETC *iface, REFIID riid, void **ppv) { - TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + EnumFORMATETC *This = ENUMF_THIS(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -55,7 +57,7 @@ static HRESULT WINAPI EnumFORMATETC_QueryInterface(IEnumFORMATETC *iface, REFIID static ULONG WINAPI EnumFORMATETC_AddRef(IEnumFORMATETC *iface) { - ENUMF_THIS(iface); + EnumFORMATETC *This = ENUMF_THIS(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); return ref; @@ -63,7 +65,7 @@ static ULONG WINAPI EnumFORMATETC_AddRef(IEnumFORMATETC *iface) static ULONG WINAPI EnumFORMATETC_Release(IEnumFORMATETC *iface) { - ENUMF_THIS(iface); + EnumFORMATETC *This = ENUMF_THIS(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -81,7 +83,7 @@ static ULONG WINAPI EnumFORMATETC_Release(IEnumFORMATETC *iface) static HRESULT WINAPI EnumFORMATETC_Next(IEnumFORMATETC *iface, ULONG celt, FORMATETC *rgelt, ULONG *pceltFetched) { - ENUMF_THIS(iface); + EnumFORMATETC *This = ENUMF_THIS(iface); ULONG cnt; TRACE("(%p)->(%d %p %p)\n", This, celt, rgelt, pceltFetched); @@ -108,7 +110,7 @@ static HRESULT WINAPI EnumFORMATETC_Next(IEnumFORMATETC *iface, ULONG celt, static HRESULT WINAPI EnumFORMATETC_Skip(IEnumFORMATETC *iface, ULONG celt) { - ENUMF_THIS(iface); + EnumFORMATETC *This = ENUMF_THIS(iface); TRACE("(%p)->(%d)\n", This, celt); @@ -118,7 +120,7 @@ static HRESULT WINAPI EnumFORMATETC_Skip(IEnumFORMATETC *iface, ULONG celt) static HRESULT WINAPI EnumFORMATETC_Reset(IEnumFORMATETC *iface) { - ENUMF_THIS(iface); + EnumFORMATETC *This = ENUMF_THIS(iface); TRACE("(%p)\n", This); @@ -128,7 +130,7 @@ static HRESULT WINAPI EnumFORMATETC_Reset(IEnumFORMATETC *iface) static HRESULT WINAPI EnumFORMATETC_Clone(IEnumFORMATETC *iface, IEnumFORMATETC **ppenum) { - ENUMF_THIS(iface); + EnumFORMATETC *This = ENUMF_THIS(iface); TRACE("(%p)->(%p)\n", This, ppenum); diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 637e58e..0d9a966 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -53,7 +53,6 @@ extern LONG URLMON_refCount; static inline void URLMON_LockModule(void) { InterlockedIncrement( &URLMON_refCount ); } static inline void URLMON_UnlockModule(void) { InterlockedDecrement( &URLMON_refCount ); } -#define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) #define DEFINE_THIS2(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,ifc))) #define DEFINE_THIS(cls,ifc,iface) DEFINE_THIS2(cls,lp ## ifc ## Vtbl,iface)

1 0

Jacek Caban : urlmon: Added IWinInetHttpInfo support to Binding object.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 67d2fdc34a894c9d48b21a6ea3c72fb3612b93da URL: http://source.winehq.org/git/wine.git/?a=commit;h=67d2fdc34a894c9d48b21a6ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 29 21:31:15 2009 +0200 urlmon: Added IWinInetHttpInfo support to Binding object. --- dlls/urlmon/binding.c | 74 +++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/bindprot.c | 16 +++++++++- dlls/urlmon/session.c | 6 +++- dlls/urlmon/tests/url.c | 18 +++++++++++ dlls/urlmon/urlmon_main.h | 5 ++- 5 files changed, 115 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=67d2fdc34a894c9d48b21…

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2009