Re: windowscodecs: Fix build failure on OSX.

[Austin English]

On Tue, Jun 30, 2015 at 2:02 PM, Sebastian Lackner
 wrote:
> The build failure unfortunately was introduced by my last patch
> http://source.winehq.org/git/wine.git/commit/863f432a7d73b8b480a742fcbaf01de...
>
> Somehow I missed that this part is OSX specific and tested on Linux only - sorry for
> the trouble. :/ The patch was tested by jam__ on IRC, would be nice if someone could
> double check that no other warnings were introduced by my original commit.
>
> dlls/windowscodecs/icnsformat.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c
> index 54c7707..5d48a1a 100644
> --- a/dlls/windowscodecs/icnsformat.c
> +++ b/dlls/windowscodecs/icnsformat.c
> @@ -179,7 +179,7 @@ static ULONG WINAPI IcnsFrameEncode_Release(IWICBitmapFrameEncode *iface)
>          if (This->icns_image != NULL)
>              HeapFree(GetProcessHeap(), 0, This->icns_image);
> -
>    IWICBitmapFrameEncode_Release(&This->encoder->IWICBitmapFrameEncode_iface);
> -
>    IWICBitmapEncoder_Release(&This->encoder->IWICBitmapEncoder_iface);
>    HeapFree(GetProcessHeap(), 0, This);
> }
>
> --
> 2.4.4

With your patch applied, the build is fixed for me. There are 5
warnings, but they're unrelated to your patch (deprecated warnings):
Austins-Mac-mini:windowscodecs austin$ make
gcc -m32 -c -o icnsformat.o icnsformat.c -I. -I../../include
-I/opt/local/include/libpng16 -D__WINESRC__ \
  -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing
-Wdeclaration-after-statement -Wempty-body \
  -Wignored-qualifiers -Wstrict-prototypes -Wtype-limits -Wvla
-Wwrite-strings -Wpointer-arith \
  -gdwarf-2 -gstrict-dwarf -fno-omit-frame-pointer -I/usr/X11/include
-I/opt/local/include \
  -I/usr/local/include -g -O2
icnsformat.c:430:11: warning: 'PtrToHand' is deprecated: first
deprecated in OS X 10.8 [-Wdeprecated-declarations]
    ret = PtrToHand(This->icns_image, &handle, This->size * This->size * 4);
          ^
/System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/MacMemory.h:1772:1:
note: 'PtrToHand' has been explicitly marked deprecated here
PtrToHand(
^
icnsformat.c:439:5: warning: 'DisposeHandle' is deprecated: first
deprecated in OS X 10.8 [-Wdeprecated-declarations]
    DisposeHandle(handle);
    ^
/System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/MacMemory.h:1278:1:
note: 'DisposeHandle' has been explicitly marked deprecated here
DisposeHandle(Handle h)
__OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0, __MAC_10_8, __IPHONE_NA,
__IPHONE_NA);
^
icnsformat.c:526:13: warning: 'DisposeHandle' is deprecated: first
deprecated in OS X 10.8 [-Wdeprecated-declarations]
            DisposeHandle((Handle)This->icns_family);
            ^
/System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/MacMemory.h:1278:1:
note: 'DisposeHandle' has been explicitly marked deprecated here
DisposeHandle(Handle h)
__OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0, __MAC_10_8, __IPHONE_NA,
__IPHONE_NA);
^
icnsformat.c:550:43: warning: 'NewHandle' is deprecated: first
deprecated in OS X 10.8 [-Wdeprecated-declarations]
    This->icns_family = (IconFamilyHandle)NewHandle(0);
                                          ^
/System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/MacMemory.h:451:1:
note: 'NewHandle' has been explicitly marked deprecated here
NewHandle(Size byteCount)
__OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0, __MAC_10_8, __IPHONE_NA,
__IPHONE_NA);
^
icnsformat.c:667:19: warning: 'GetHandleSize' is deprecated: first
deprecated in OS X 10.8 [-Wdeprecated-declarations]
    buffer_size = GetHandleSize((Handle)This->icns_family);
                  ^
/System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/MacMemory.h:1356:1:
note: 'GetHandleSize' has been explicitly marked deprecated here
GetHandleSize(Handle h)
__OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0, __MAC_10_8, __IPHONE_NA,
__IPHONE_NA);
^
5 warnings generated.