Signed-off-by: Francois Gouget fgouget@free.fr --- I'm not sure the CDECL is really useful there but in doubt I decided to keep it. --- dlls/wmphoto/unix_lib.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/wmphoto/unix_lib.c b/dlls/wmphoto/unix_lib.c index 235828941f7..94a67434b7e 100644 --- a/dlls/wmphoto/unix_lib.c +++ b/dlls/wmphoto/unix_lib.c @@ -180,7 +180,7 @@ static JXR_ERR wmp_stream_GetPos(struct WMPStream *iface, size_t *pos) return WMP_errSuccess; }
-HRESULT CDECL wmp_decoder_initialize(struct decoder *iface, IStream *stream, struct decoder_stat *st) +static HRESULT CDECL wmp_decoder_initialize(struct decoder *iface, IStream *stream, struct decoder_stat *st) { struct wmp_decoder *This = impl_from_decoder(iface); HRESULT hr; @@ -252,7 +252,7 @@ HRESULT CDECL wmp_decoder_initialize(struct decoder *iface, IStream *stream, str return S_OK; }
-HRESULT CDECL wmp_decoder_get_frame_info(struct decoder *iface, UINT frame, struct decoder_frame *info) +static HRESULT CDECL wmp_decoder_get_frame_info(struct decoder *iface, UINT frame, struct decoder_frame *info) { struct wmp_decoder *This = impl_from_decoder(iface);
@@ -268,7 +268,7 @@ HRESULT CDECL wmp_decoder_get_frame_info(struct decoder *iface, UINT frame, stru return S_OK; }
-HRESULT CDECL wmp_decoder_copy_pixels(struct decoder *iface, UINT frame, const WICRect *prc, UINT stride, UINT buffersize, BYTE *buffer) +static HRESULT CDECL wmp_decoder_copy_pixels(struct decoder *iface, UINT frame, const WICRect *prc, UINT stride, UINT buffersize, BYTE *buffer) { struct wmp_decoder *This = impl_from_decoder(iface); PKRect pkrect; @@ -306,7 +306,7 @@ HRESULT CDECL wmp_decoder_copy_pixels(struct decoder *iface, UINT frame, const W prc, stride, buffersize, buffer); }
-HRESULT CDECL wmp_decoder_get_metadata_blocks(struct decoder* iface, UINT frame, UINT *count, struct decoder_block **blocks) +static HRESULT CDECL wmp_decoder_get_metadata_blocks(struct decoder* iface, UINT frame, UINT *count, struct decoder_block **blocks) { TRACE("iface %p, frame %d, count %p, blocks %p\n", iface, frame, count, blocks);
@@ -315,7 +315,7 @@ HRESULT CDECL wmp_decoder_get_metadata_blocks(struct decoder* iface, UINT frame, return S_OK; }
-HRESULT CDECL wmp_decoder_get_color_context(struct decoder* iface, UINT frame, UINT num, BYTE **data, DWORD *datasize) +static HRESULT CDECL wmp_decoder_get_color_context(struct decoder* iface, UINT frame, UINT num, BYTE **data, DWORD *datasize) { struct wmp_decoder *This = impl_from_decoder(iface); U32 count; @@ -348,7 +348,7 @@ HRESULT CDECL wmp_decoder_get_color_context(struct decoder* iface, UINT frame, U return S_OK; }
-void CDECL wmp_decoder_destroy(struct decoder* iface) +static void CDECL wmp_decoder_destroy(struct decoder* iface) { struct wmp_decoder *This = impl_from_decoder(iface);
On 8/27/21 12:59 PM, Francois Gouget wrote:
Signed-off-by: Francois Gouget fgouget@free.fr
I'm not sure the CDECL is really useful there but in doubt I decided to keep it.
I'm not completely sure how this is organized anymore but it's part of unixlib interface, which should be marked CDECL (or at least something explicit).
For instance windowscodecs/decoder.c lives in Win32 (and so expects a default ms_abi) and calls the interface functions, which are (or may be) implemented on the Unix side (so by default would have sysv_abi).
The decoder interface is supposed to be the same on the win32 side and the unixlib side. Currently, we don't have any encoders or decoders implemented on the win32 side. Strictly speaking, I don't think we need CDECL on the unixlib side, but I'd like to keep them so the implementations carry over easily to win32.
It'd be nice to port GIF, BMP, and TGA support to this system so we can share more code between them, but it's probably not worth the time since they're already implemented. We may also want to eliminate the unixlib entirely and move all our decoders to the win32 side.
-
Esme Povirk (she/they) -
Francois Gouget -
Rémi Bernon