[PATCH] comctl32: Bump version to 6.0.

[Nikolay Sivov]

On Tue, Nov 12, 2019 at 1:13 PM Dmitry Timoshkov <dmitry at baikal.ru> wrote:

> An application that I have here checks comctl32.dll version information
> and refuses to run, changing DLL version to 6.0 makes it run.
>
> Signed-off-by: Dmitry Timoshkov <dmitry at baikal.ru>
> ---
>  dlls/comctl32/comctl32.h  | 2 +-
>  dlls/comctl32/comctl32.rc | 2 +-
>  include/commctrl.h        | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h
> index f3e889c4bd..ca1738085a 100644
> --- a/dlls/comctl32/comctl32.h
> +++ b/dlls/comctl32/comctl32.h
> @@ -192,7 +192,7 @@ INT  Str_GetPtrAtoW (LPCSTR lpSrc, LPWSTR lpDest, INT
> nMaxLen) DECLSPEC_HIDDEN;
>  BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc) DECLSPEC_HIDDEN;
>  BOOL Str_SetPtrWtoA (LPSTR *lppDest, LPCWSTR lpSrc) DECLSPEC_HIDDEN;
>
> -#define COMCTL32_VERSION_MINOR 81
> +#define COMCTL32_VERSION_MINOR 0
>
>  /* Our internal stack structure of the window procedures to subclass */
>  typedef struct _SUBCLASSPROCS {
> diff --git a/dlls/comctl32/comctl32.rc b/dlls/comctl32/comctl32.rc
> index c9aa1ba625..be6e242519 100644
> --- a/dlls/comctl32/comctl32.rc
> +++ b/dlls/comctl32/comctl32.rc
> @@ -114,7 +114,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
>  #define WINE_FILEDESCRIPTION_STR "Wine Common Controls"
>  #define WINE_FILENAME_STR "comctl32.dll"
>  #define WINE_FILEVERSION COMCTL32_VERSION, COMCTL32_VERSION_MINOR, 4704,
> 1100
> -#define WINE_FILEVERSION_STR "5.81"
> +#define WINE_FILEVERSION_STR "6.00.4704.1100"
>  #define WINE_PRODUCTVERSION WINE_FILEVERSION
>  #define WINE_PRODUCTVERSION_STR WINE_FILEVERSION_STR
>
> diff --git a/include/commctrl.h b/include/commctrl.h
> index 700b335fbb..029a4b4545 100644
> --- a/include/commctrl.h
> +++ b/include/commctrl.h
> @@ -51,7 +51,7 @@ enum _LI_METRIC
>  HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE, const WCHAR *, int, int,
> HICON *);
>  HRESULT WINAPI LoadIconMetric(HINSTANCE, const WCHAR *, int, HICON *);
>
> -#define COMCTL32_VERSION                5  /* dll version */
> +#define COMCTL32_VERSION                6  /* dll version */
>

So which one does it check, resources or DllGetVersion()?


>
>  #ifndef _WIN32_IE
>  #define _WIN32_IE 0x0400
> --
> 2.20.1
>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.winehq.org/pipermail/wine-devel/attachments/20191112/5cbbdc29/attachment-0001.htm>