- Wine-Commits - list.winehq.org

Zebediah Figura : tests/shader_runner: Remove an unnecessary local variable declaration.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: vkd3d Branch: master Commit: d1ce069ea6e4a0dfd98e58009716653583eacae4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d1ce069ea6e4a0dfd98e580097166… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Apr 30 17:39:15 2023 -0500 tests/shader_runner: Remove an unnecessary local variable declaration. Found with -Wshadow. --- tests/shader_runner.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 2b875440..0e6104ce 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -618,7 +618,6 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) D3D_PRIMITIVE_TOPOLOGY topology; struct resource_params params; unsigned int vertex_count; - char *rest; if (!shader_runner_get_resource(runner, RESOURCE_TYPE_RENDER_TARGET, 0)) {

1 0

Jacek Caban : configure: Enable -Wenum-conversion warnings.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: vkd3d Branch: master Commit: d7b20d7c01b2de5d2bf7f894e9d623412917c61c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d7b20d7c01b2de5d2bf7f894e9d62… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 27 16:01:19 2023 +0100 configure: Enable -Wenum-conversion warnings. --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 35617c4f..6cd9d9b7 100644 --- a/configure.ac +++ b/configure.ac @@ -65,6 +65,7 @@ AS_IF([test "x${GCC}" = "xyes"], VKD3D_CHECK_CFLAGS([-Wunused-but-set-parameter]) VKD3D_CHECK_CFLAGS([-Wvla]) VKD3D_CHECK_CFLAGS([-Wpointer-arith]) + VKD3D_CHECK_CFLAGS([-Wenum-conversion]) VKD3D_CHECK_CFLAGS([-Wl,--no-undefined])]) dnl Check for cross compilers

1 0

Zebediah Figura : vkd3d-shader/tpf: Remove an unnecessary local variable declaration.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: vkd3d Branch: master Commit: 10957bebbf7dd09b12808f97c627709e12327a89 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/10957bebbf7dd09b12808f97c6277… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Apr 30 17:41:30 2023 -0500 vkd3d-shader/tpf: Remove an unnecessary local variable declaration. Found with -Wshadow. --- libs/vkd3d-shader/tpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 61d14e30..81ead41e 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3528,8 +3528,8 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) { const unsigned int var_size = (profile->major_version >= 5 ? 10 : 6); size_t var_offset = vars_start + j * var_size * sizeof(uint32_t); - size_t string_offset = put_string(&buffer, var->name); + string_offset = put_string(&buffer, var->name); set_u32(&buffer, var_offset, string_offset); write_sm4_type(ctx, &buffer, var->data_type); set_u32(&buffer, var_offset + 4 * sizeof(uint32_t), var->data_type->bytecode_offset);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Remove an unnecessary local variable in copy_propagation_get_value().
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: vkd3d Branch: master Commit: 2d1825bb893b3280259ca70c3a2a384a9b302454 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2d1825bb893b3280259ca70c3a2a3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Apr 30 17:40:32 2023 -0500 vkd3d-shader/hlsl: Remove an unnecessary local variable in copy_propagation_get_value(). Found with -Wshadow. --- libs/vkd3d-shader/hlsl_codegen.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 294a8156..628de796 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1304,12 +1304,10 @@ static struct copy_propagation_value *copy_propagation_get_value(const struct co { struct copy_propagation_var_def *var_def = RB_ENTRY_VALUE(entry, struct copy_propagation_var_def, entry); unsigned int component_count = hlsl_type_component_count(var->data_type); - enum copy_propagation_value_state state; assert(component < component_count); - state = var_def->values[component].state; - switch (state) + switch (var_def->values[component].state) { case VALUE_STATE_STATICALLY_WRITTEN: return &var_def->values[component];

1 0

Alistair Leslie-Hughes : include: D3D12_RT_FORMAT_ARRAY remove typedef to make header compatible with windows.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: vkd3d Branch: master Commit: 5c134d44d6cd9145b810c216cb6fca7af16b0af4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5c134d44d6cd9145b810c216cb6fc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 24 19:06:32 2023 +1100 include: D3D12_RT_FORMAT_ARRAY remove typedef to make header compatible with windows. windows d3d12.idl doesn't have this as a typedef. --- include/vkd3d_d3d12.idl | 4 ++-- libs/vkd3d/state.c | 2 +- libs/vkd3d/vkd3d_private.h | 2 +- tests/d3d12.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index cdd3acec..9b1b494c 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -2129,11 +2129,11 @@ typedef struct D3D12_PIPELINE_STATE_STREAM_DESC void *pPipelineStateSubobjectStream; } D3D12_PIPELINE_STATE_STREAM_DESC; -typedef struct D3D12_RT_FORMAT_ARRAY +struct D3D12_RT_FORMAT_ARRAY { DXGI_FORMAT RTFormats[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT]; UINT NumRenderTargets; -} D3D12_RT_FORMAT_ARRAY; +}; typedef enum D3D12_PIPELINE_STATE_SUBOBJECT_TYPE { diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index de0e04ea..6665a1fd 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1839,7 +1839,7 @@ static HRESULT pipeline_state_desc_from_d3d12_stream_desc(struct d3d12_pipeline_ [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_INPUT_LAYOUT] = DCL_SUBOBJECT_INFO(D3D12_INPUT_LAYOUT_DESC, input_layout), [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_IB_STRIP_CUT_VALUE] = DCL_SUBOBJECT_INFO(D3D12_INDEX_BUFFER_STRIP_CUT_VALUE, strip_cut_value), [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_PRIMITIVE_TOPOLOGY] = DCL_SUBOBJECT_INFO(D3D12_PRIMITIVE_TOPOLOGY_TYPE, primitive_topology_type), - [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_RENDER_TARGET_FORMATS] = DCL_SUBOBJECT_INFO(D3D12_RT_FORMAT_ARRAY, rtv_formats), + [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_RENDER_TARGET_FORMATS] = DCL_SUBOBJECT_INFO(struct D3D12_RT_FORMAT_ARRAY, rtv_formats), [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL_FORMAT] = DCL_SUBOBJECT_INFO(DXGI_FORMAT, dsv_format), [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_SAMPLE_DESC] = DCL_SUBOBJECT_INFO(DXGI_SAMPLE_DESC, sample_desc), [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_NODE_MASK] = DCL_SUBOBJECT_INFO(UINT, node_mask), diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 04ba3498..e0eb9f3d 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1334,7 +1334,7 @@ struct d3d12_pipeline_state_desc D3D12_INPUT_LAYOUT_DESC input_layout; D3D12_INDEX_BUFFER_STRIP_CUT_VALUE strip_cut_value; D3D12_PRIMITIVE_TOPOLOGY_TYPE primitive_topology_type; - D3D12_RT_FORMAT_ARRAY rtv_formats; + struct D3D12_RT_FORMAT_ARRAY rtv_formats; DXGI_FORMAT dsv_format; DXGI_SAMPLE_DESC sample_desc; D3D12_VIEW_INSTANCING_DESC view_instancing_desc; diff --git a/tests/d3d12.c b/tests/d3d12.c index 8727fd9e..91e91608 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3265,7 +3265,7 @@ static void test_create_pipeline_state(void) struct d3d12_render_target_formats_subobject { DECLSPEC_ALIGN(sizeof(void *)) D3D12_PIPELINE_STATE_SUBOBJECT_TYPE type; - D3D12_RT_FORMAT_ARRAY render_target_formats; + struct D3D12_RT_FORMAT_ARRAY render_target_formats; }; struct d3d12_depth_stencil_format_subobject

1 0

Jacek Caban : vkd3d-shader: Avoid implicit enum pointer casts in allocate_semantic_register.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: vkd3d Branch: master Commit: 85f21f197c9cbd9df8fa3d292b0e3de388fdbf65 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/85f21f197c9cbd9df8fa3d292b0e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 24 14:03:25 2023 +0100 vkd3d-shader: Avoid implicit enum pointer casts in allocate_semantic_register. --- libs/vkd3d-shader/hlsl_codegen.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 5a70878b..294a8156 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -4089,7 +4089,7 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var [VKD3D_SHADER_TYPE_COMPUTE] = "Compute", }; - unsigned int type; + enum vkd3d_shader_register_type type; uint32_t reg; bool builtin; @@ -4097,6 +4097,7 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var if (ctx->profile->major_version < 4) { + D3DSHADER_PARAM_REGISTER_TYPE sm1_type; D3DDECLUSAGE usage; uint32_t usage_idx; @@ -4104,7 +4105,7 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var if (ctx->profile->major_version == 1 && output && ctx->profile->type == VKD3D_SHADER_TYPE_PIXEL) return; - builtin = hlsl_sm1_register_from_semantic(ctx, &var->semantic, output, &type, &reg); + builtin = hlsl_sm1_register_from_semantic(ctx, &var->semantic, output, &sm1_type, &reg); if (!builtin && !hlsl_sm1_usage_from_semantic(&var->semantic, &usage, &usage_idx)) { hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC, @@ -4114,6 +4115,7 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var if ((!output && !var->last_read) || (output && !var->first_write)) return; + type = (enum vkd3d_shader_register_type)sm1_type; } else {

1 0

Jacek Caban : vkd3d: Use VkPipelineStageFlags type for VkSubmitInfo.pWaitDstStageMask flags.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: vkd3d Branch: master Commit: 72bb5e8b020edbfd962aad000c2e21d037efc12d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/72bb5e8b020edbfd962aad000c2e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 24 14:00:29 2023 +0100 vkd3d: Use VkPipelineStageFlags type for VkSubmitInfo.pWaitDstStageMask flags. --- libs/vkd3d/command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 77d0f275..15c8317b 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -6852,7 +6852,7 @@ fail: static HRESULT d3d12_command_queue_wait_binary_semaphore_locked(struct d3d12_command_queue *command_queue, struct d3d12_fence *fence, uint64_t value) { - static const VkPipelineStageFlagBits wait_stage_mask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT; + static const VkPipelineStageFlags wait_stage_mask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT; const struct vkd3d_vk_device_procs *vk_procs; struct vkd3d_signaled_semaphore *semaphore; uint64_t completed_value = 0; @@ -6948,7 +6948,7 @@ fail: static HRESULT d3d12_command_queue_wait_locked(struct d3d12_command_queue *command_queue, struct d3d12_fence *fence, uint64_t value) { - static const VkPipelineStageFlagBits wait_stage_mask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT; + static const VkPipelineStageFlags wait_stage_mask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT; VkTimelineSemaphoreSubmitInfoKHR timeline_submit_info; const struct vkd3d_vk_device_procs *vk_procs; struct vkd3d_queue *queue;

1 0

Jacek Caban : gitlab: Remove no longer needed -Wno-enum-conversion from build-mac.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: vkd3d Branch: master Commit: b47ac10b5c07caf4d0f4b4aa97d900e9ee98a165 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b47ac10b5c07caf4d0f4b4aa97d90… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 27 15:37:14 2023 +0100 gitlab: Remove no longer needed -Wno-enum-conversion from build-mac. --- gitlab/build-mac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab/build-mac b/gitlab/build-mac index 27c70d31..17a8c7a0 100755 --- a/gitlab/build-mac +++ b/gitlab/build-mac @@ -11,7 +11,7 @@ set -Eeuxo pipefail rm -fr build mkdir build cd build -if ../configure CFLAGS="-g -O2 -Wno-implicit-fallthrough -Wno-enum-conversion -Werror" && \ +if ../configure CFLAGS="-g -O2 -Wno-implicit-fallthrough -Werror" && \ make -j$(sysctl -n hw.ncpu) ; then make -j$(sysctl -n hw.ncpu) check || \ touch ../tests_failed

1 0

Jacek Caban : vkd3d-shader: Use unsigned int type for tags passed to sm6_metadata_get_uint_value.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: vkd3d Branch: master Commit: 1edbc057450d4b9bbb32b8e254fcb19beebbb7b3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1edbc057450d4b9bbb32b8e254fcb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 24 14:01:35 2023 +0100 vkd3d-shader: Use unsigned int type for tags passed to sm6_metadata_get_uint_value. --- libs/vkd3d-shader/dxil.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 1709212f..c03948ae 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -4895,8 +4895,7 @@ static enum vkd3d_result sm6_parser_resources_init(struct sm6_parser *sm6) static void signature_element_read_additional_element_values(struct signature_element *e, const struct sm6_metadata_node *node, struct sm6_parser *sm6) { - unsigned int i, operand_count, value; - enum dxil_element_additional_tag tag; + unsigned int i, operand_count, value, tag; if (node->operand_count < 11 || !node->operands[10]) return; @@ -5254,8 +5253,7 @@ static enum vkd3d_result sm6_parser_entry_point_init(struct sm6_parser *sm6) { const struct sm6_metadata_value *m = sm6_parser_find_named_metadata(sm6, "dx.entryPoints"); const struct sm6_metadata_node *node, *entry_node = m ? m->u.node : NULL; - enum dxil_shader_properties_tag tag; - unsigned int i, operand_count; + unsigned int i, operand_count, tag; const struct sm6_value *value; enum vkd3d_result ret;

1 0

Alexandre Julliard : gphoto2.ds: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 048f2f346d499b35d1f2c600f92e91d1ab8d444b URL: https://gitlab.winehq.org/wine/wine/-/commit/048f2f346d499b35d1f2c600f92e91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 27 22:39:08 2023 +0100 gphoto2.ds: Remove DECLSPEC_HIDDEN usage. --- dlls/gphoto2.ds/gphoto2_i.h | 56 ++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_i.h b/dlls/gphoto2.ds/gphoto2_i.h index f52eebd1b00..231047555f2 100644 --- a/dlls/gphoto2.ds/gphoto2_i.h +++ b/dlls/gphoto2.ds/gphoto2_i.h @@ -34,7 +34,7 @@ #include "wine/list.h" -extern HINSTANCE GPHOTO2_instance DECLSPEC_HIDDEN; +extern HINSTANCE GPHOTO2_instance; /* internal information about an active data source */ struct tagActiveDS @@ -63,64 +63,64 @@ struct tagActiveDS struct jpeg_error_mgr jerr; }; -extern struct tagActiveDS activeDS DECLSPEC_HIDDEN; +extern struct tagActiveDS activeDS; /* Helper functions */ -extern TW_UINT16 GPHOTO2_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) DECLSPEC_HIDDEN; +extern TW_UINT16 GPHOTO2_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action); /* Implementation of operation triplets * From Application to Source (Image Information) */ TW_UINT16 GPHOTO2_CIEColorGet - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_ExtImageInfoGet - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_GrayResponseReset - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_GrayResponseSet - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_ImageFileXferGet - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_ImageInfoGet - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_ImageLayoutGet - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_ImageLayoutGetDefault - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_ImageLayoutReset - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_ImageLayoutSet - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_ImageMemXferGet - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_ImageNativeXferGet - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_JPEGCompressionGet - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_JPEGCompressionGetDefault - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_JPEGCompressionReset - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_JPEGCompressionSet - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_Palette8Get - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_Palette8GetDefault - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_Palette8Reset - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_Palette8Set - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_RGBResponseReset - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_RGBResponseSet - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); /* UI function */ -BOOL DoCameraUI(void) DECLSPEC_HIDDEN; -HWND TransferringDialogBox(HWND dialog, LONG progress) DECLSPEC_HIDDEN; +BOOL DoCameraUI(void); +HWND TransferringDialogBox(HWND dialog, LONG progress); /* Helper function for GUI */ TW_UINT16 -_get_gphoto2_file_as_DIB( unsigned int idx, BOOL preview, HWND hwnd, HBITMAP *hDIB ) DECLSPEC_HIDDEN; +_get_gphoto2_file_as_DIB( unsigned int idx, BOOL preview, HWND hwnd, HBITMAP *hDIB ); #endif

1 0