wine-commits September 2013

wine-commits@winehq.org

2 participants
645 discussions

Andrew Eikum : oleaut32: Typelib strings of size -1 are NULL.
by Alexandre Julliard 09 Sep '13

09 Sep '13

Module: wine Branch: master Commit: 808c47cecba0fcd4a9a62b69183e88d20cabbe19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=808c47cecba0fcd4a9a62b691… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Sep 9 09:17:23 2013 -0500 oleaut32: Typelib strings of size -1 are NULL. --- dlls/oleaut32/typelib.c | 29 +++++++++++------------------ 1 files changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 18c1e19..476f089 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2258,24 +2258,17 @@ static void MSFT_ReadValue( VARIANT * pVar, int offset, TLBContext *pcx ) case VT_BSTR :{ char * ptr; MSFT_ReadLEDWords(&size, sizeof(INT), pcx, DO_NOT_SEEK ); - if(size < 0) { - char next; - DWORD origPos = MSFT_Tell(pcx), nullPos; - - do { - MSFT_Read(&next, 1, pcx, DO_NOT_SEEK); - } while (next); - nullPos = MSFT_Tell(pcx); - size = nullPos - origPos; - MSFT_Seek(pcx, origPos); - } - ptr = heap_alloc_zero(size);/* allocate temp buffer */ - MSFT_Read(ptr, size, pcx, DO_NOT_SEEK);/* read string (ANSI) */ - V_BSTR(pVar)=SysAllocStringLen(NULL,size); - /* FIXME: do we need a AtoW conversion here? */ - V_UNION(pVar, bstrVal[size])='\0'; - while(size--) V_UNION(pVar, bstrVal[size])=ptr[size]; - heap_free(ptr); + if(size == -1){ + V_BSTR(pVar) = NULL; + }else{ + ptr = heap_alloc_zero(size); + MSFT_Read(ptr, size, pcx, DO_NOT_SEEK); + V_BSTR(pVar)=SysAllocStringLen(NULL,size); + /* FIXME: do we need a AtoW conversion here? */ + V_UNION(pVar, bstrVal[size])='\0'; + while(size--) V_UNION(pVar, bstrVal[size])=ptr[size]; + heap_free(ptr); + } } size=-4; break; /* FIXME: this will not work AT ALL when the variant contains a pointer */

1 0

Detlef Riekenberg : d3dx11_42: Add stub dll.
by Alexandre Julliard 09 Sep '13

09 Sep '13

Module: wine Branch: master Commit: 6cb21569768f32bf92c90cba0cfea136ee00bbb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cb21569768f32bf92c90cba0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Sep 4 09:51:37 2013 +0200 d3dx11_42: Add stub dll. --- configure | 1 + configure.ac | 1 + dlls/d3dx11_42/Makefile.in | 7 +++++ dlls/d3dx11_42/d3dx11_42.c | 55 +++++++++++++++++++++++++++++++++++++++++ dlls/d3dx11_42/d3dx11_42.spec | 44 ++++++++++++++++++++++++++++++++ dlls/d3dx11_42/version.rc | 26 +++++++++++++++++++ tools/make_specfiles | 4 +++ 7 files changed, 138 insertions(+), 0 deletions(-) diff --git a/configure b/configure index b041ce7..5056a20 100755 --- a/configure +++ b/configure @@ -15993,6 +15993,7 @@ wine_fn_config_dll d3dx10_40 enable_d3dx10_40 wine_fn_config_dll d3dx10_41 enable_d3dx10_41 wine_fn_config_dll d3dx10_42 enable_d3dx10_42 wine_fn_config_dll d3dx10_43 enable_d3dx10_43 +wine_fn_config_dll d3dx11_42 enable_d3dx11_42 wine_fn_config_dll d3dx11_43 enable_d3dx11_43 wine_fn_config_dll d3dx9_24 enable_d3dx9_24 wine_fn_config_dll d3dx9_25 enable_d3dx9_25 diff --git a/configure.ac b/configure.ac index 707e8bb..66b4dd6 100644 --- a/configure.ac +++ b/configure.ac @@ -2675,6 +2675,7 @@ WINE_CONFIG_DLL(d3dx10_40) WINE_CONFIG_DLL(d3dx10_41) WINE_CONFIG_DLL(d3dx10_42) WINE_CONFIG_DLL(d3dx10_43) +WINE_CONFIG_DLL(d3dx11_42) WINE_CONFIG_DLL(d3dx11_43) WINE_CONFIG_DLL(d3dx9_24) WINE_CONFIG_DLL(d3dx9_25) diff --git a/dlls/d3dx11_42/Makefile.in b/dlls/d3dx11_42/Makefile.in new file mode 100644 index 0000000..aea3b7d --- /dev/null +++ b/dlls/d3dx11_42/Makefile.in @@ -0,0 +1,7 @@ +MODULE = d3dx11_42.dll + +C_SRCS = d3dx11_42.c + +RC_SRCS = version.rc + +@MAKE_DLL_RULES@ diff --git a/dlls/d3dx11_42/d3dx11_42.c b/dlls/d3dx11_42/d3dx11_42.c new file mode 100644 index 0000000..ac56fbe --- /dev/null +++ b/dlls/d3dx11_42/d3dx11_42.c @@ -0,0 +1,55 @@ +/* + * Copyright 2013 Detlef Riekenberg + * + * 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 <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "objbase.h" +#include "d3d11.h" + +BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hdll); + } + + return TRUE; +} + +/*********************************************************************** + * D3DX11CheckVersion + * + * Checks whether we are compiling against the correct d3d and d3dx library. + */ +BOOL WINAPI D3DX11CheckVersion(UINT d3dsdkversion, UINT d3dxsdkversion) +{ + if ((d3dsdkversion == D3D11_SDK_VERSION) && (d3dxsdkversion == 42)) + return TRUE; + + return FALSE; +} diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec new file mode 100644 index 0000000..3fd291c --- /dev/null +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -0,0 +1,44 @@ +@ stdcall D3DX11CheckVersion(long long) +@ stub D3DX11CompileFromFileA +@ stub D3DX11CompileFromFileW +@ stub D3DX11CompileFromMemory +@ stub D3DX11CompileFromResourceA +@ stub D3DX11CompileFromResourceW +@ stub D3DX11ComputeNormalMap +@ stub D3DX11CreateAsyncCompilerProcessor +@ stub D3DX11CreateAsyncFileLoaderA +@ stub D3DX11CreateAsyncFileLoaderW +@ stub D3DX11CreateAsyncMemoryLoader +@ stub D3DX11CreateAsyncResourceLoaderA +@ stub D3DX11CreateAsyncResourceLoaderW +@ stub D3DX11CreateAsyncShaderPreprocessProcessor +@ stub D3DX11CreateAsyncShaderResourceViewProcessor +@ stub D3DX11CreateAsyncTextureInfoProcessor +@ stub D3DX11CreateAsyncTextureProcessor +@ stub D3DX11CreateShaderResourceViewFromFileA +@ stub D3DX11CreateShaderResourceViewFromFileW +@ stub D3DX11CreateShaderResourceViewFromMemory +@ stub D3DX11CreateShaderResourceViewFromResourceA +@ stub D3DX11CreateShaderResourceViewFromResourceW +@ stub D3DX11CreateTextureFromFileA +@ stub D3DX11CreateTextureFromFileW +@ stub D3DX11CreateTextureFromMemory +@ stub D3DX11CreateTextureFromResourceA +@ stub D3DX11CreateTextureFromResourceW +@ stub D3DX11CreateThreadPump +@ stub D3DX11FilterTexture +@ stub D3DX11GetImageInfoFromFileA +@ stub D3DX11GetImageInfoFromFileW +@ stub D3DX11GetImageInfoFromMemory +@ stub D3DX11GetImageInfoFromResourceA +@ stub D3DX11GetImageInfoFromResourceW +@ stub D3DX11LoadTextureFromTexture +@ stub D3DX11PreprocessShaderFromFileA +@ stub D3DX11PreprocessShaderFromFileW +@ stub D3DX11PreprocessShaderFromMemory +@ stub D3DX11PreprocessShaderFromResourceA +@ stub D3DX11PreprocessShaderFromResourceW +@ stub D3DX11SHProjectCubeMap +@ stub D3DX11SaveTextureToFileA +@ stub D3DX11SaveTextureToFileW +@ stub D3DX11SaveTextureToMemory diff --git a/dlls/d3dx11_42/version.rc b/dlls/d3dx11_42/version.rc new file mode 100644 index 0000000..808abd9 --- /dev/null +++ b/dlls/d3dx11_42/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2013 Detlef Riekenberg + * + * 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 D3DX11" +#define WINE_FILENAME_STR "d3dx11_42.dll" +#define WINE_FILEVERSION 9,29,952,3111 +#define WINE_FILEVERSION_STR "9.29.952.3111" +#define WINE_PRODUCTVERSION 9,29,952,3111 +#define WINE_PRODUCTVERSION_STR "9.29.952.3111" + +#include "wine/wine_common_ver.rc" diff --git a/tools/make_specfiles b/tools/make_specfiles index c0e6a06..5314c41 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -86,6 +86,10 @@ my @dll_groups = "d3dx10_33", ], [ + "d3dx11_43", + "d3dx11_42", + ], + [ "d3dcompiler_43", "d3dcompiler_42", "d3dcompiler_41",

1 0

Detlef Riekenberg : d3dx11_43: Add stub dll.
by Alexandre Julliard 09 Sep '13

09 Sep '13

Module: wine Branch: master Commit: e10b687dbfd26a8222a90c6f5d988900c3be790f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e10b687dbfd26a8222a90c6f5… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Sep 4 09:51:36 2013 +0200 d3dx11_43: Add stub dll. --- configure | 1 + configure.ac | 1 + dlls/d3dx11_43/Makefile.in | 7 +++++ dlls/d3dx11_43/d3dx11_43.c | 55 +++++++++++++++++++++++++++++++++++++++++ dlls/d3dx11_43/d3dx11_43.spec | 44 ++++++++++++++++++++++++++++++++ dlls/d3dx11_43/version.rc | 26 +++++++++++++++++++ 6 files changed, 134 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 3143509..b041ce7 100755 --- a/configure +++ b/configure @@ -15993,6 +15993,7 @@ wine_fn_config_dll d3dx10_40 enable_d3dx10_40 wine_fn_config_dll d3dx10_41 enable_d3dx10_41 wine_fn_config_dll d3dx10_42 enable_d3dx10_42 wine_fn_config_dll d3dx10_43 enable_d3dx10_43 +wine_fn_config_dll d3dx11_43 enable_d3dx11_43 wine_fn_config_dll d3dx9_24 enable_d3dx9_24 wine_fn_config_dll d3dx9_25 enable_d3dx9_25 wine_fn_config_dll d3dx9_26 enable_d3dx9_26 diff --git a/configure.ac b/configure.ac index 7b662b4..707e8bb 100644 --- a/configure.ac +++ b/configure.ac @@ -2675,6 +2675,7 @@ WINE_CONFIG_DLL(d3dx10_40) WINE_CONFIG_DLL(d3dx10_41) WINE_CONFIG_DLL(d3dx10_42) WINE_CONFIG_DLL(d3dx10_43) +WINE_CONFIG_DLL(d3dx11_43) WINE_CONFIG_DLL(d3dx9_24) WINE_CONFIG_DLL(d3dx9_25) WINE_CONFIG_DLL(d3dx9_26) diff --git a/dlls/d3dx11_43/Makefile.in b/dlls/d3dx11_43/Makefile.in new file mode 100644 index 0000000..3f15f46 --- /dev/null +++ b/dlls/d3dx11_43/Makefile.in @@ -0,0 +1,7 @@ +MODULE = d3dx11_43.dll + +C_SRCS = d3dx11_43.c + +RC_SRCS = version.rc + +@MAKE_DLL_RULES@ diff --git a/dlls/d3dx11_43/d3dx11_43.c b/dlls/d3dx11_43/d3dx11_43.c new file mode 100644 index 0000000..a609613 --- /dev/null +++ b/dlls/d3dx11_43/d3dx11_43.c @@ -0,0 +1,55 @@ +/* + * Copyright 2013 Detlef Riekenberg + * + * 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 <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "objbase.h" +#include "d3d11.h" + +BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hdll); + } + + return TRUE; +} + +/*********************************************************************** + * D3DX11CheckVersion + * + * Checks whether we are compiling against the correct d3d and d3dx library. + */ +BOOL WINAPI D3DX11CheckVersion(UINT d3dsdkversion, UINT d3dxsdkversion) +{ + if ((d3dsdkversion == D3D11_SDK_VERSION) && (d3dxsdkversion == 43)) + return TRUE; + + return FALSE; +} diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec new file mode 100644 index 0000000..3fd291c --- /dev/null +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -0,0 +1,44 @@ +@ stdcall D3DX11CheckVersion(long long) +@ stub D3DX11CompileFromFileA +@ stub D3DX11CompileFromFileW +@ stub D3DX11CompileFromMemory +@ stub D3DX11CompileFromResourceA +@ stub D3DX11CompileFromResourceW +@ stub D3DX11ComputeNormalMap +@ stub D3DX11CreateAsyncCompilerProcessor +@ stub D3DX11CreateAsyncFileLoaderA +@ stub D3DX11CreateAsyncFileLoaderW +@ stub D3DX11CreateAsyncMemoryLoader +@ stub D3DX11CreateAsyncResourceLoaderA +@ stub D3DX11CreateAsyncResourceLoaderW +@ stub D3DX11CreateAsyncShaderPreprocessProcessor +@ stub D3DX11CreateAsyncShaderResourceViewProcessor +@ stub D3DX11CreateAsyncTextureInfoProcessor +@ stub D3DX11CreateAsyncTextureProcessor +@ stub D3DX11CreateShaderResourceViewFromFileA +@ stub D3DX11CreateShaderResourceViewFromFileW +@ stub D3DX11CreateShaderResourceViewFromMemory +@ stub D3DX11CreateShaderResourceViewFromResourceA +@ stub D3DX11CreateShaderResourceViewFromResourceW +@ stub D3DX11CreateTextureFromFileA +@ stub D3DX11CreateTextureFromFileW +@ stub D3DX11CreateTextureFromMemory +@ stub D3DX11CreateTextureFromResourceA +@ stub D3DX11CreateTextureFromResourceW +@ stub D3DX11CreateThreadPump +@ stub D3DX11FilterTexture +@ stub D3DX11GetImageInfoFromFileA +@ stub D3DX11GetImageInfoFromFileW +@ stub D3DX11GetImageInfoFromMemory +@ stub D3DX11GetImageInfoFromResourceA +@ stub D3DX11GetImageInfoFromResourceW +@ stub D3DX11LoadTextureFromTexture +@ stub D3DX11PreprocessShaderFromFileA +@ stub D3DX11PreprocessShaderFromFileW +@ stub D3DX11PreprocessShaderFromMemory +@ stub D3DX11PreprocessShaderFromResourceA +@ stub D3DX11PreprocessShaderFromResourceW +@ stub D3DX11SHProjectCubeMap +@ stub D3DX11SaveTextureToFileA +@ stub D3DX11SaveTextureToFileW +@ stub D3DX11SaveTextureToMemory diff --git a/dlls/d3dx11_43/version.rc b/dlls/d3dx11_43/version.rc new file mode 100644 index 0000000..622875e --- /dev/null +++ b/dlls/d3dx11_43/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2013 Detlef Riekenberg + * + * 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 D3DX11" +#define WINE_FILENAME_STR "d3dx11_43.dll" +#define WINE_FILEVERSION 9,29,952,3111 +#define WINE_FILEVERSION_STR "9.29.952.3111" +#define WINE_PRODUCTVERSION 9,29,952,3111 +#define WINE_PRODUCTVERSION_STR "9.29.952.3111" + +#include "wine/wine_common_ver.rc"

1 0

André Hentschel : include: Add delayloadhandler.h.
by Alexandre Julliard 09 Sep '13

09 Sep '13

Module: wine Branch: master Commit: a5abebf6add7fc635035907d57f0d02667a52bea URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5abebf6add7fc635035907d5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Aug 22 19:03:27 2013 +0200 include: Add delayloadhandler.h. --- include/Makefile.in | 1 + include/delayloadhandler.h | 55 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index d6e08e0..3da2977 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -247,6 +247,7 @@ SRCDIR_INCLUDES = \ ddraw.h \ ddrawgdi.h \ ddrawi.h \ + delayloadhandler.h \ devenum.idl \ devguid.h \ devpkey.h \ diff --git a/include/delayloadhandler.h b/include/delayloadhandler.h new file mode 100644 index 0000000..06b6589 --- /dev/null +++ b/include/delayloadhandler.h @@ -0,0 +1,55 @@ +/* + * Copyright 2013 André Hentschel + * + * 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 + */ + +#ifndef __WINE_DELAYLOADHANDLER_H +#define __WINE_DELAYLOADHANDLER_H + +#ifdef __cplusplus +extern "C" { +#endif + +#define DELAYLOAD_GPA_FAILURE 4 + +typedef struct _DELAYLOAD_PROC_DESCRIPTOR +{ + ULONG ImportDescribedByName; + union { + LPCSTR Name; + ULONG Ordinal; + } Description; +} DELAYLOAD_PROC_DESCRIPTOR, *PDELAYLOAD_PROC_DESCRIPTOR; + +typedef struct _DELAYLOAD_INFO +{ + ULONG Size; + PCIMAGE_DELAYLOAD_DESCRIPTOR DelayloadDescriptor; + PIMAGE_THUNK_DATA ThunkAddress; + LPCSTR TargetDllName; + DELAYLOAD_PROC_DESCRIPTOR TargetApiDescriptor; + PVOID TargetModuleBase; + PVOID Unused; + ULONG LastError; +} DELAYLOAD_INFO, *PDELAYLOAD_INFO; + +typedef PVOID (WINAPI *PDELAYLOAD_FAILURE_DLL_CALLBACK)(ULONG, PDELAYLOAD_INFO); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_DELAYLOADHANDLER_H */

1 0

André Hentschel : winedump: Add and use IMAGE_DELAYLOAD_DESCRIPTOR.
by Alexandre Julliard 09 Sep '13

09 Sep '13

Module: wine Branch: master Commit: d9a6deff4b66277e51eef8e42271e7d113a8a2f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9a6deff4b66277e51eef8e42… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Aug 22 18:58:59 2013 +0200 winedump: Add and use IMAGE_DELAYLOAD_DESCRIPTOR. --- include/winnt.h | 22 ++++++++++++++++++++++ tools/winedump/pe.c | 26 ++++++++------------------ 2 files changed, 30 insertions(+), 18 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 1f71423..be55d9c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3052,6 +3052,28 @@ typedef struct _IMAGE_RELOCATION #define IMAGE_SIZEOF_RELOCATION 10 +typedef struct _IMAGE_DELAYLOAD_DESCRIPTOR +{ + union + { + DWORD AllAttributes; + struct + { + DWORD RvaBased:1; + DWORD ReservedAttributes:31; + } DUMMYSTRUCTNAME; + } Attributes; + + DWORD DllNameRVA; + DWORD ModuleHandleRVA; + DWORD ImportAddressTableRVA; + DWORD ImportNameTableRVA; + DWORD BoundImportAddressTableRVA; + DWORD UnloadInformationTableRVA; + DWORD TimeDateStamp; +} IMAGE_DELAYLOAD_DESCRIPTOR, *PIMAGE_DELAYLOAD_DESCRIPTOR; +typedef const IMAGE_DELAYLOAD_DESCRIPTOR *PCIMAGE_DELAYLOAD_DESCRIPTOR; + /* generic relocation types */ #define IMAGE_REL_BASED_ABSOLUTE 0 #define IMAGE_REL_BASED_HIGH 1 diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index c26ae69..6721898 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -864,17 +864,7 @@ static void dump_dir_imported_functions(void) static void dump_dir_delay_imported_functions(void) { unsigned directorySize; - const struct ImgDelayDescr - { - DWORD grAttrs; - DWORD szName; - DWORD phmod; - DWORD pIAT; - DWORD pINT; - DWORD pBoundIAT; - DWORD pUnloadIAT; - DWORD dwTimeStamp; - } *importDesc = get_dir_and_size(IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT, &directorySize); + const IMAGE_DELAYLOAD_DESCRIPTOR *importDesc = get_dir_and_size(IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT, &directorySize); if (!importDesc) return; @@ -883,19 +873,19 @@ static void dump_dir_delay_imported_functions(void) for (;;) { const IMAGE_THUNK_DATA32* il; - int offset = (importDesc->grAttrs & 1) ? 0 : PE_nt_headers->OptionalHeader.ImageBase; + int offset = (importDesc->Attributes.AllAttributes & 1) ? 0 : PE_nt_headers->OptionalHeader.ImageBase; - if (!importDesc->szName || !importDesc->pIAT || !importDesc->pINT) break; + if (!importDesc->DllNameRVA || !importDesc->ImportAddressTableRVA || !importDesc->ImportNameTableRVA) break; - printf(" grAttrs %08x offset %08lx %s\n", importDesc->grAttrs, Offset(importDesc), - (const char *)RVA(importDesc->szName - offset, sizeof(DWORD))); - printf(" Hint/Name Table: %08x\n", importDesc->pINT); + printf(" grAttrs %08x offset %08lx %s\n", importDesc->Attributes.AllAttributes, Offset(importDesc), + (const char *)RVA(importDesc->DllNameRVA - offset, sizeof(DWORD))); + printf(" Hint/Name Table: %08x\n", importDesc->ImportNameTableRVA); printf(" TimeDateStamp: %08X (%s)\n", - importDesc->dwTimeStamp, get_time_str(importDesc->dwTimeStamp)); + importDesc->TimeDateStamp, get_time_str(importDesc->TimeDateStamp)); printf(" Ordn Name\n"); - il = RVA(importDesc->pINT - offset, sizeof(DWORD)); + il = RVA(importDesc->ImportNameTableRVA - offset, sizeof(DWORD)); if (!il) printf("Can't grab thunk data, going to next imported DLL\n");

1 0

Sylvain Petreolle : wbemprox: Implement Win32_OperatingSystem.LocalDateTime .
by Alexandre Julliard 09 Sep '13

09 Sep '13

Module: wine Branch: master Commit: 4a1d4acd29d5d0e45e00923ac65c5f7d35c04231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a1d4acd29d5d0e45e00923ac… Author: Sylvain Petreolle <spetreolle(a)yahoo.fr> Date: Sun Sep 8 16:47:16 2013 +0200 wbemprox: Implement Win32_OperatingSystem.LocalDateTime. --- dlls/wbemprox/builtin.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index d310704..8dca46e 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -160,6 +160,8 @@ static const WCHAR prop_intvalueW[] = {'I','n','t','e','g','e','r','V','a','l','u','e',0}; static const WCHAR prop_lastbootuptimeW[] = {'L','a','s','t','B','o','o','t','U','p','T','i','m','e',0}; +static const WCHAR prop_localdatetimeW[] = + {'L','o','c','a','l','D','a','t','e','T','i','m','e',0}; static const WCHAR prop_localeW[] = {'L','o','c','a','l','e',0}; static const WCHAR prop_macaddressW[] = @@ -339,6 +341,7 @@ static const struct column col_os[] = { prop_countrycodeW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_csdversionW, CIM_STRING }, { prop_lastbootuptimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, + { prop_localdatetimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, { prop_localeW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_osarchitectureW, CIM_STRING }, { prop_oslanguageW, CIM_UINT32, VT_I4 }, @@ -591,6 +594,7 @@ struct record_operatingsystem const WCHAR *countrycode; const WCHAR *csdversion; const WCHAR *lastbootuptime; + const WCHAR *localdatetime; const WCHAR *locale; const WCHAR *osarchitecture; UINT32 oslanguage; @@ -1777,6 +1781,31 @@ static WCHAR *get_lastbootuptime(void) sprintfW( ret, fmtW, tf.Year, tf.Month, tf.Day, tf.Hour, tf.Minute, tf.Second, tf.Milliseconds * 1000 ); return ret; } +static WCHAR *get_localdatetime(void) +{ + static const WCHAR fmtW[] = + {'%','0','4','u','%','0','2','u','%','0','2','u','%','0','2','u','%','0','2','u','%','0','2','u', + '.','%','0','6','u','%','+','0','3','d',0}; + TIME_ZONE_INFORMATION tzi; + SYSTEMTIME st; + WCHAR *ret; + DWORD Status; + LONG Bias; + + Status = GetTimeZoneInformation(&tzi); + + if(Status == TIME_ZONE_ID_INVALID) return NULL; + Bias = tzi.Bias; + if(Status == TIME_ZONE_ID_DAYLIGHT) + Bias+= tzi.DaylightBias; + else + Bias+= tzi.StandardBias; + if (!(ret = heap_alloc( 26 * sizeof(WCHAR) ))) return NULL; + + GetLocalTime(&st); + sprintfW( ret, fmtW, st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond, st.wMilliseconds * 1000, -Bias); + return ret; +} static WCHAR *get_systemdirectory(void) { void *redir; @@ -1822,6 +1851,7 @@ static enum fill_status fill_os( struct table *table, const struct expr *cond ) rec->countrycode = get_countrycode(); rec->csdversion = os_csdversionW; rec->lastbootuptime = get_lastbootuptime(); + rec->localdatetime = get_localdatetime(); rec->locale = get_locale(); rec->osarchitecture = get_osarchitecture(); rec->oslanguage = GetSystemDefaultLangID();

1 0

Bruno Jesus : kernel32: Fix parameters checking for GetVolumePathName().
by Alexandre Julliard 09 Sep '13

09 Sep '13

Module: wine Branch: master Commit: 3465646d446f2537faeb9b8f0a5d04cc3f1048e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3465646d446f2537faeb9b8f0… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Sep 6 12:19:34 2013 -0300 kernel32: Fix parameters checking for GetVolumePathName(). --- dlls/kernel32/tests/volume.c | 13 ++++++++----- dlls/kernel32/volume.c | 23 +++++++++++++++++++---- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index e63a2ef..02446ea 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -606,7 +606,6 @@ static void test_GetVolumePathNameA(void) ret = pGetVolumePathNameA(NULL, NULL, 0); error = GetLastError(); ok(!ret, "expected failure\n"); -todo_wine ok(error == ERROR_INVALID_PARAMETER || broken( error == 0xdeadbeef) /* <=XP */, "expected ERROR_INVALID_PARAMETER got %u\n", error); @@ -615,7 +614,6 @@ todo_wine ret = pGetVolumePathNameA("", NULL, 0); error = GetLastError(); ok(!ret, "expected failure\n"); -todo_wine ok(error == ERROR_INVALID_PARAMETER || broken( error == 0xdeadbeef) /* <=XP */, "expected ERROR_INVALID_PARAMETER got %u\n", error); @@ -624,7 +622,6 @@ todo_wine ret = pGetVolumePathNameA(pathC1, NULL, 0); error = GetLastError(); ok(!ret, "expected failure\n"); -todo_wine ok(error == ERROR_INVALID_PARAMETER || broken(error == ERROR_FILENAME_EXCED_RANGE) /* <=XP */, "expected ERROR_INVALID_PARAMETER got %u\n", error); @@ -633,7 +630,6 @@ todo_wine ret = pGetVolumePathNameA(pathC1, volume, 0); error = GetLastError(); ok(!ret, "expected failure\n"); -todo_wine ok(error == ERROR_INVALID_PARAMETER || broken(error == ERROR_FILENAME_EXCED_RANGE ) /* <=XP */, "expected ERROR_INVALID_PARAMETER got %u\n", error); @@ -642,7 +638,6 @@ todo_wine ret = pGetVolumePathNameA(pathC1, volume, 1); error = GetLastError(); ok(!ret, "expected failure\n"); -todo_wine ok(error == ERROR_FILENAME_EXCED_RANGE, "expected ERROR_FILENAME_EXCED_RANGE got %u\n", error); volume[0] = '\0'; @@ -664,6 +659,14 @@ todo_wine ok(ret, "expected success\n"); todo_wine ok(!strcmp(expected, volume), "expected name '%s', returned '%s'\n", expected, volume); + + /* test an invalid path */ + SetLastError( 0xdeadbeef ); + ret = pGetVolumePathNameA("\\\\$$$", volume, 1); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_INVALID_NAME || broken(ERROR_FILENAME_EXCED_RANGE) /* <=2000 */, + "expected ERROR_INVALID_NAME got %u\n", error); } static void test_GetVolumePathNamesForVolumeNameA(void) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 72b04df..1509d73 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1782,12 +1782,14 @@ BOOL WINAPI GetDiskFreeSpaceA( LPCSTR root, LPDWORD cluster_sectors, BOOL WINAPI GetVolumePathNameA(LPCSTR filename, LPSTR volumepathname, DWORD buflen) { BOOL ret; - WCHAR *filenameW = NULL, *volumeW; + WCHAR *filenameW = NULL, *volumeW = NULL; FIXME("(%s, %p, %d), stub!\n", debugstr_a(filename), volumepathname, buflen); - if (filename && !(filenameW = FILE_name_AtoW( filename, FALSE ))) return FALSE; - if (!(volumeW = HeapAlloc( GetProcessHeap(), 0, buflen * sizeof(WCHAR) ))) return FALSE; + if (filename && !(filenameW = FILE_name_AtoW( filename, FALSE ))) + return FALSE; + if (volumepathname && !(volumeW = HeapAlloc( GetProcessHeap(), 0, buflen * sizeof(WCHAR) ))) + return FALSE; if ((ret = GetVolumePathNameW( filenameW, volumeW, buflen ))) FILE_name_WtoA( volumeW, -1, volumepathname, buflen ); @@ -1805,14 +1807,27 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu FIXME("(%s, %p, %d), stub!\n", debugstr_w(filename), volumepathname, buflen); - if (p && tolowerW(p[0]) >= 'a' && tolowerW(p[0]) <= 'z' && p[1] ==':' && p[2] == '\\' && buflen >= 4) + if (!filename || !volumepathname || !buflen) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (p && tolowerW(p[0]) >= 'a' && tolowerW(p[0]) <= 'z' && p[1] ==':' && p[2] == '\\') { + if (buflen < 4) + { + SetLastError(ERROR_FILENAME_EXCED_RANGE); + return FALSE; + } volumepathname[0] = p[0]; volumepathname[1] = ':'; volumepathname[2] = '\\'; volumepathname[3] = 0; return TRUE; } + + SetLastError(ERROR_INVALID_NAME); return FALSE; }

1 0

Nikolay Sivov : shell32: Remove asserts on invalid parameters.
by Alexandre Julliard 09 Sep '13

09 Sep '13

Module: wine Branch: master Commit: 1c13e6221a9092121f8e05b1aaf9ccc1c202a74c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c13e6221a9092121f8e05b1a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 9 11:36:36 2013 +0400 shell32: Remove asserts on invalid parameters. --- dlls/shell32/assoc.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index 848bf87..d28fa20 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS #include "windef.h" @@ -224,7 +223,6 @@ static HRESULT ASSOC_GetValue(HKEY hkey, const WCHAR *name, void **data, DWORD * DWORD size; LONG ret; - assert(data); ret = RegQueryValueExW(hkey, name, 0, NULL, NULL, &size); if (ret != ERROR_SUCCESS) return HRESULT_FROM_WIN32(ret); @@ -337,8 +335,6 @@ static HRESULT ASSOC_GetExecutable(IQueryAssociationsImpl *This, WCHAR *pszEnd; HRESULT hr; - assert(len); - hr = ASSOC_GetCommand(This, pszExtra, &pszCommand); if (FAILED(hr)) return hr; @@ -376,8 +372,6 @@ static HRESULT ASSOC_GetExecutable(IQueryAssociationsImpl *This, static HRESULT ASSOC_ReturnData(void *out, DWORD *outlen, const void *data, DWORD datalen) { - assert(outlen); - if (out) { if (*outlen < datalen)

1 0

Nikolay Sivov : shell32: Fix handle leak on consecutive Init() calls.
by Alexandre Julliard 09 Sep '13

09 Sep '13

Module: wine Branch: master Commit: f0d17b5c171c8814851f740280e103681bce0c22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0d17b5c171c8814851f74028… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 9 11:35:37 2013 +0400 shell32: Fix handle leak on consecutive Init() calls. --- dlls/shell32/assoc.c | 11 +++++++++-- dlls/shell32/tests/assoc.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index 77b0a2d..848bf87 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -184,6 +184,10 @@ static HRESULT WINAPI IQueryAssociations_fnInit( FIXME("hwnd != NULL not supported\n"); if (cfFlags != 0) FIXME("unsupported flags: %x\n", cfFlags); + + RegCloseKey(This->hkeySource); + RegCloseKey(This->hkeyProgID); + This->hkeySource = This->hkeyProgID = NULL; if (pszAssoc != NULL) { ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, @@ -191,8 +195,8 @@ static HRESULT WINAPI IQueryAssociations_fnInit( 0, KEY_READ, &This->hkeySource); - if (ret != ERROR_SUCCESS) - return E_FAIL; + if (ret) + return S_OK; /* if this is not a prog id */ if ((*pszAssoc == '.') || (*pszAssoc == '{')) { @@ -468,6 +472,9 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( if (!pcchOut) return E_UNEXPECTED; + if (!This->hkeySource && !This->hkeyProgID) + return HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION); + switch (str) { case ASSOCSTR_COMMAND: diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c index abfe6d4..ff999e9 100644 --- a/dlls/shell32/tests/assoc.c +++ b/dlls/shell32/tests/assoc.c @@ -103,6 +103,8 @@ struct assoc_getstring_test }; static const WCHAR httpW[] = {'h','t','t','p',0}; +static const WCHAR httpsW[] = {'h','t','t','p','s',0}; +static const WCHAR badW[] = {'b','a','d','b','a','d',0}; static struct assoc_getstring_test getstring_tests[] = { @@ -163,6 +165,31 @@ static void test_IQueryAssociations_GetString(void) IQueryAssociations_Release(assoc); } +static void test_IQueryAssociations_Init(void) +{ + IQueryAssociations *assoc; + HRESULT hr; + DWORD len; + + hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&assoc); + ok(hr == S_OK, "failed to create object, 0x%x\n", hr); + + hr = IQueryAssociations_Init(assoc, 0, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "Init failed, 0x%08x\n", hr); + + hr = IQueryAssociations_Init(assoc, 0, httpW, NULL, NULL); + ok(hr == S_OK, "Init failed, 0x%08x\n", hr); + + hr = IQueryAssociations_Init(assoc, 0, badW, NULL, NULL); + ok(hr == S_OK || broken(hr == S_FALSE) /* pre-vista */, "Init failed, 0x%08x\n", hr); + + len = 0; + hr = IQueryAssociations_GetString(assoc, 0, ASSOCSTR_EXECUTABLE, NULL, NULL, &len); + ok(hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) || broken(hr == E_FAIL) /* pre-vista */, "got 0x%08x\n", hr); + + IQueryAssociations_Release(assoc); +} + START_TEST(assoc) { IQueryAssociations *qa; @@ -176,6 +203,7 @@ START_TEST(assoc) { test_IQueryAssociations_QueryInterface(); test_IQueryAssociations_GetString(); + test_IQueryAssociations_Init(); IQueryAssociations_Release(qa); }

1 0

Nikolay Sivov : shell32: Added support for ASSOCF_NOTRUNCATE flag in GetString().
by Alexandre Julliard 09 Sep '13

09 Sep '13

Module: wine Branch: master Commit: 891cf2ac54b69cf7d2f8c093338108a7b1e24edf URL: http://source.winehq.org/git/wine.git/?a=commit;h=891cf2ac54b69cf7d2f8c0933… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 9 11:21:03 2013 +0400 shell32: Added support for ASSOCF_NOTRUNCATE flag in GetString(). --- dlls/shell32/assoc.c | 67 +++++++++++++++++++++---------- dlls/shell32/tests/assoc.c | 93 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 131 insertions(+), 29 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index 65f4644..77b0a2d 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -392,17 +392,41 @@ static HRESULT ASSOC_ReturnData(void *out, DWORD *outlen, const void *data, } } -static HRESULT ASSOC_ReturnString(LPWSTR out, DWORD *outlen, LPCWSTR data, - DWORD datalen) +static HRESULT ASSOC_ReturnString(ASSOCF flags, LPWSTR out, DWORD *outlen, LPCWSTR data, DWORD datalen) { - HRESULT hres; + HRESULT hr = S_OK; + DWORD len; - assert(outlen); + TRACE("flags=0x%08x, data=%s\n", flags, debugstr_w(data)); - *outlen *= sizeof(WCHAR); - hres = ASSOC_ReturnData(out, outlen, data, datalen*sizeof(WCHAR)); - *outlen /= sizeof(WCHAR); - return hres; + if (!out) + { + *outlen = datalen; + return S_FALSE; + } + + if (*outlen < datalen) + { + if (flags & ASSOCF_NOTRUNCATE) + { + len = 0; + if (*outlen > 0) out[0] = 0; + hr = E_POINTER; + } + else + { + len = min(*outlen, datalen); + hr = E_NOT_SUFFICIENT_BUFFER; + } + *outlen = datalen; + } + else + len = datalen; + + if (len) + memcpy(out, data, len*sizeof(WCHAR)); + + return hr; } /************************************************************************** @@ -424,23 +448,22 @@ static HRESULT ASSOC_ReturnString(LPWSTR out, DWORD *outlen, LPCWSTR data, */ static HRESULT WINAPI IQueryAssociations_fnGetString( IQueryAssociations *iface, - ASSOCF cfFlags, + ASSOCF flags, ASSOCSTR str, LPCWSTR pszExtra, LPWSTR pszOut, DWORD *pcchOut) { IQueryAssociationsImpl *This = impl_from_IQueryAssociations(iface); - const ASSOCF cfUnimplemented = ~(0); + const ASSOCF unimplemented_flags = ~ASSOCF_NOTRUNCATE; DWORD len = 0; HRESULT hr; WCHAR path[MAX_PATH]; - TRACE("(%p,0x%08x,%u,%s,%p,%p)\n", This, cfFlags, str, - debugstr_w(pszExtra), pszOut, pcchOut); + TRACE("(%p)->(0x%08x, %u, %s, %p, %p)\n", This, flags, str, debugstr_w(pszExtra), pszOut, pcchOut); - if (cfFlags & cfUnimplemented) - FIXME("%08x: unimplemented flags!\n", cfFlags & cfUnimplemented); + if (flags & unimplemented_flags) + FIXME("%08x: unimplemented flags\n", flags & unimplemented_flags); if (!pcchOut) return E_UNEXPECTED; @@ -453,7 +476,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( hr = ASSOC_GetCommand(This, pszExtra, &command); if (SUCCEEDED(hr)) { - hr = ASSOC_ReturnString(pszOut, pcchOut, command, strlenW(command) + 1); + hr = ASSOC_ReturnString(flags, pszOut, pcchOut, command, strlenW(command) + 1); HeapFree(GetProcessHeap(), 0, command); } return hr; @@ -465,7 +488,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( if (FAILED(hr)) return hr; len++; - return ASSOC_ReturnString(pszOut, pcchOut, path, len); + return ASSOC_ReturnString(flags, pszOut, pcchOut, path, len); } case ASSOCSTR_FRIENDLYDOCNAME: @@ -486,7 +509,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( { ret = RegGetValueW(HKEY_CLASSES_ROOT, pszFileType, NULL, RRF_RT_REG_SZ, NULL, docName, &size); if (ret == ERROR_SUCCESS) - hr = ASSOC_ReturnString(pszOut, pcchOut, docName, strlenW(docName) + 1); + hr = ASSOC_ReturnString(flags, pszOut, pcchOut, docName, strlenW(docName) + 1); else hr = HRESULT_FROM_WIN32(ret); HeapFree(GetProcessHeap(), 0, docName); @@ -542,7 +565,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( /* Does strlenW(bufW) == 0 mean we use the filename? */ len = strlenW(bufW) + 1; TRACE("found FileDescription: %s\n", debugstr_w(bufW)); - hr = ASSOC_ReturnString(pszOut, pcchOut, bufW, len); + hr = ASSOC_ReturnString(flags, pszOut, pcchOut, bufW, len); HeapFree(GetProcessHeap(), 0, verinfoW); return hr; } @@ -552,7 +575,7 @@ get_friendly_name_fail: PathRemoveExtensionW(path); PathStripPathW(path); TRACE("using filename: %s\n", debugstr_w(path)); - hr = ASSOC_ReturnString(pszOut, pcchOut, path, strlenW(path) + 1); + hr = ASSOC_ReturnString(flags, pszOut, pcchOut, path, strlenW(path) + 1); HeapFree(GetProcessHeap(), 0, verinfoW); return hr; } @@ -573,7 +596,7 @@ get_friendly_name_fail: { ret = RegGetValueW(This->hkeySource, NULL, Content_TypeW, RRF_RT_REG_SZ, NULL, contentType, &size); if (ret == ERROR_SUCCESS) - hr = ASSOC_ReturnString(pszOut, pcchOut, contentType, strlenW(contentType) + 1); + hr = ASSOC_ReturnString(flags, pszOut, pcchOut, contentType, strlenW(contentType) + 1); else hr = HRESULT_FROM_WIN32(ret); HeapFree(GetProcessHeap(), 0, contentType); @@ -606,7 +629,7 @@ get_friendly_name_fail: { ret = RegGetValueW(hkeyFile, DefaultIconW, NULL, RRF_RT_REG_SZ, NULL, icon, &size); if (ret == ERROR_SUCCESS) - hr = ASSOC_ReturnString(pszOut, pcchOut, icon, strlenW(icon) + 1); + hr = ASSOC_ReturnString(flags, pszOut, pcchOut, icon, strlenW(icon) + 1); else hr = HRESULT_FROM_WIN32(ret); HeapFree(GetProcessHeap(), 0, icon); @@ -645,7 +668,7 @@ get_friendly_name_fail: RegCloseKey(hkey); if (ret) return HRESULT_FROM_WIN32(ret); - return ASSOC_ReturnString(pszOut, pcchOut, guid, size / sizeof(WCHAR)); + return ASSOC_ReturnString(flags, pszOut, pcchOut, guid, size / sizeof(WCHAR)); } default: diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c index 29524dc..abfe6d4 100644 --- a/dlls/shell32/tests/assoc.c +++ b/dlls/shell32/tests/assoc.c @@ -35,13 +35,8 @@ static void test_IQueryAssociations_QueryInterface(void) IUnknown *unk; HRESULT hr; - /* this works since XP */ hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&qa); - - if (FAILED(hr)) { - win_skip("CoCreateInstance for IQueryAssociations returned 0x%x\n", hr); - return; - } + ok(hr == S_OK, "got 0x%08x\n", hr); hr = IQueryAssociations_QueryInterface(qa, &IID_IQueryAssociations, (void**)&qa2); ok(hr == S_OK, "QueryInterface (IQueryAssociations) returned 0x%x\n", hr); @@ -97,12 +92,96 @@ static void test_IApplicationAssociationRegistration_QueryInterface(void) IApplicationAssociationRegistration_Release(appreg); } +struct assoc_getstring_test +{ + const WCHAR *key; + ASSOCF flags; + ASSOCSTR str; + DWORD len; + HRESULT hr; + HRESULT brokenhr; +}; + +static const WCHAR httpW[] = {'h','t','t','p',0}; + +static struct assoc_getstring_test getstring_tests[] = +{ + { httpW, 0, ASSOCSTR_EXECUTABLE, 2, 0x8007007a /* E_NOT_SUFFICIENT_BUFFER */, S_OK }, + { httpW, ASSOCF_NOTRUNCATE, ASSOCSTR_EXECUTABLE, 2, E_POINTER }, + { NULL } +}; + +static void test_IQueryAssociations_GetString(void) +{ + struct assoc_getstring_test *ptr = getstring_tests; + IQueryAssociations *assoc; + HRESULT hr; + DWORD len; + int i = 0; + + hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&assoc); + ok(hr == S_OK, "failed to create object, 0x%x\n", hr); + + hr = IQueryAssociations_Init(assoc, 0, httpW, NULL, NULL); + ok(hr == S_OK, "Init failed, 0x%x\n", hr); + + len = 0; + hr = IQueryAssociations_GetString(assoc, 0, ASSOCSTR_EXECUTABLE, NULL, NULL, &len); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(len > 0, "got wrong needed length, %d\n", len); + + while (ptr->key) + { + WCHAR buffW[MAX_PATH]; + DWORD len; + + hr = IQueryAssociations_Init(assoc, 0, ptr->key, NULL, NULL); + ok(hr == S_OK, "%d: Init failed, 0x%x\n", i, hr); + + len = ptr->len; + buffW[0] = ptr->flags & ASSOCF_NOTRUNCATE ? 0x1 : 0; + hr = IQueryAssociations_GetString(assoc, ptr->flags, ptr->str, NULL, buffW, &len); + if (hr != ptr->hr) + ok(broken(hr == ptr->brokenhr), "%d: GetString failed, 0x%08x\n", i, hr); + else + { + ok(hr == ptr->hr, "%d: GetString failed, 0x%08x\n", i, hr); + ok(len > ptr->len, "%d: got needed length %d\n", i, len); + } + + /* even with ASSOCF_NOTRUNCATE it's null terminated */ + if ((ptr->flags & ASSOCF_NOTRUNCATE) && (ptr->len > 0)) + ok(buffW[0] == 0 || broken(buffW[0] == 0x1) /* pre win7 */, "%d: got %x\n", i, buffW[0]); + + if (!(ptr->flags & ASSOCF_NOTRUNCATE) && ptr->len && FAILED(ptr->hr)) + ok(buffW[0] != 0, "%d: got %x\n", i, buffW[0]); + + i++; + ptr++; + } + + IQueryAssociations_Release(assoc); +} START_TEST(assoc) { + IQueryAssociations *qa; + HRESULT hr; + CoInitialize(NULL); - test_IQueryAssociations_QueryInterface(); + /* this works since XP */ + hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&qa); + if (hr == S_OK) + { + test_IQueryAssociations_QueryInterface(); + test_IQueryAssociations_GetString(); + + IQueryAssociations_Release(qa); + } + else + win_skip("IQueryAssociations not supported, 0x%x\n", hr); + test_IApplicationAssociationRegistration_QueryInterface(); CoUninitialize();

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
65
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 September 2013