September 2021 - Wine-commits

Hans Leidekker : secur32: Don't allocate new handles in the wrapper.
by Alexandre Julliard 29 Sep '21

29 Sep '21

Module: wine Branch: master Commit: ddf8c92721d230a880ae2171224e1785e6f29817 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddf8c92721d230a880ae2171… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 29 14:13:10 2021 +0200 secur32: Don't allocate new handles in the wrapper. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/wrapper.c | 292 +++++++++---------------------------------------- 1 file changed, 52 insertions(+), 240 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ddf8c92721d230a880ae…

1 0

Connor McAdams : user32/tests: Fix dump_sequence winevent_hook_todo handling.
by Alexandre Julliard 29 Sep '21

29 Sep '21

Module: wine Branch: master Commit: 1b78c229f52d50f055bef74008d7c6cd9692165d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b78c229f52d50f055bef740… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Sep 28 21:12:29 2021 -0400 user32/tests: Fix dump_sequence winevent_hook_todo handling. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9602649600f..43253953a9e 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2665,7 +2665,8 @@ static void dump_sequence(const struct message *expected, const char *context, c } } /* silently drop winevent messages if there is no support for them */ - else if ((expected->flags & optional) || ((expected->flags & winevent_hook) && !hEvent_hook)) + else if ((expected->flags & optional) || ((expected->flags & winevent_hook) && !hEvent_hook) || + ((expected->flags & winevent_hook_todo) && !strcmp(winetest_platform, "wine"))) expected++; else {

1 0

Rémi Bernon : include: Add HID Physical Interface Device usage page.
by Alexandre Julliard 29 Sep '21

29 Sep '21

Module: wine Branch: master Commit: b3630bddb591b71c4aa2d390fa944331aeb34550 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3630bddb591b71c4aa2d390… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 29 10:24:53 2021 +0200 include: Add HID Physical Interface Device usage page. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/hidusage.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/hidusage.h b/include/hidusage.h index 002040bddc0..da7274b5945 100644 --- a/include/hidusage.h +++ b/include/hidusage.h @@ -197,6 +197,7 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_PAGE_CONSUMER ((USAGE) 0x0C) #define HID_USAGE_PAGE_DIGITIZER ((USAGE) 0x0D) #define HID_USAGE_PAGE_HAPTICS ((USAGE) 0x0E) +#define HID_USAGE_PAGE_PID ((USAGE) 0x0F) #define HID_USAGE_PAGE_UNICODE ((USAGE) 0x10) #define HID_USAGE_PAGE_ALPHANUMERIC ((USAGE) 0x14) #define HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN ((USAGE) 0xff00)

1 0

Rémi Bernon : include: Add Wine-specific HID PID usages definitions.
by Alexandre Julliard 29 Sep '21

29 Sep '21

Module: wine Branch: master Commit: 3dc21ab03bf79845d62523d5f73267ffe678103d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dc21ab03bf79845d62523d5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 29 10:24:54 2021 +0200 include: Add Wine-specific HID PID usages definitions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/hid.h | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/include/wine/hid.h b/include/wine/hid.h index 1d489a24c88..236888cbdc7 100644 --- a/include/wine/hid.h +++ b/include/wine/hid.h @@ -117,4 +117,114 @@ struct hid_preparsed_data #define HID_FEATURE_VALUE_CAPS(d) ((d)->value_caps + (d)->feature_caps_start) #define HID_COLLECTION_NODES(d) (struct hid_collection_node *)((char *)(d)->value_caps + (d)->caps_size) +/* Wine-specific Physical Interface Device usages */ +/* From USB Device Class Definition for Physical Interface Devices */ +/* https://www.usb.org/sites/default/files/documents/pid1_01.pdf */ +#define PID_USAGE_UNDEFINED ((USAGE) 0x00) +#define PID_USAGE_PID ((USAGE) 0x01) +#define PID_USAGE_NORMAL ((USAGE) 0x20) +#define PID_USAGE_SET_EFFECT_REPORT ((USAGE) 0x21) +#define PID_USAGE_EFFECT_BLOCK_INDEX ((USAGE) 0x22) +#define PID_USAGE_PARAMETER_BLOCK_OFFSET ((USAGE) 0x23) +#define PID_USAGE_ROM_FLAG ((USAGE) 0x24) +#define PID_USAGE_EFFECT_TYPE ((USAGE) 0x25) +#define PID_USAGE_ET_CONSTANT_FORCE ((USAGE) 0x26) +#define PID_USAGE_ET_RAMP ((USAGE) 0x27) +#define PID_USAGE_ET_CUSTOM_FORCE_DATA ((USAGE) 0x28) +#define PID_USAGE_ET_SQUARE ((USAGE) 0x30) +#define PID_USAGE_ET_SINE ((USAGE) 0x31) +#define PID_USAGE_ET_TRIANGLE ((USAGE) 0x32) +#define PID_USAGE_ET_SAWTOOTH_UP ((USAGE) 0x33) +#define PID_USAGE_ET_SAWTOOTH_DOWN ((USAGE) 0x34) +#define PID_USAGE_ET_SPRING ((USAGE) 0x40) +#define PID_USAGE_ET_DAMPER ((USAGE) 0x41) +#define PID_USAGE_ET_INERTIA ((USAGE) 0x42) +#define PID_USAGE_ET_FRICTION ((USAGE) 0x43) +#define PID_USAGE_DURATION ((USAGE) 0x50) +#define PID_USAGE_SAMPLE_PERIOD ((USAGE) 0x51) +#define PID_USAGE_GAIN ((USAGE) 0x52) +#define PID_USAGE_TRIGGER_BUTTON ((USAGE) 0x53) +#define PID_USAGE_TRIGGER_REPEAT_INTERVAL ((USAGE) 0x54) +#define PID_USAGE_AXES_ENABLE ((USAGE) 0x55) +#define PID_USAGE_DIRECTION_ENABLE ((USAGE) 0x56) +#define PID_USAGE_DIRECTION ((USAGE) 0x57) +#define PID_USAGE_TYPE_SPECIFIC_BLOCK_OFFSET ((USAGE) 0x58) +#define PID_USAGE_BLOCK_TYPE ((USAGE) 0x59) +#define PID_USAGE_SET_ENVELOPE_REPORT ((USAGE) 0x5a) +#define PID_USAGE_ATTACK_LEVEL ((USAGE) 0x5b) +#define PID_USAGE_ATTACK_TIME ((USAGE) 0x5c) +#define PID_USAGE_FADE_LEVEL ((USAGE) 0x5d) +#define PID_USAGE_FADE_TIME ((USAGE) 0x5e) +#define PID_USAGE_SET_CONDITION_REPORT ((USAGE) 0x5f) +#define PID_USAGE_CP_OFFSET ((USAGE) 0x60) +#define PID_USAGE_POSITIVE_COEFFICIENT ((USAGE) 0x61) +#define PID_USAGE_NEGATIVE_COEFFICIENT ((USAGE) 0x62) +#define PID_USAGE_POSITIVE_SATURATION ((USAGE) 0x63) +#define PID_USAGE_NEGATIVE_SATURATION ((USAGE) 0x64) +#define PID_USAGE_DEAD_BAND ((USAGE) 0x65) +#define PID_USAGE_DOWNLOAD_FORCE_SAMPLE ((USAGE) 0x66) +#define PID_USAGE_ISOCH_CUSTOM_FORCE_ENABLE ((USAGE) 0x67) +#define PID_USAGE_CUSTOM_FORCE_DATA_REPORT ((USAGE) 0x68) +#define PID_USAGE_CUSTOM_FORCE_DATA ((USAGE) 0x69) +#define PID_USAGE_CUSTOM_FORCE_VENDOR_DEFINED_DATA ((USAGE) 0x6a) +#define PID_USAGE_SET_CUSTOM_FORCE_REPORT ((USAGE) 0x6b) +#define PID_USAGE_CUSTOM_FORCE_DATA_OFFSET ((USAGE) 0x6c) +#define PID_USAGE_SAMPLE_COUNT ((USAGE) 0x6d) +#define PID_USAGE_SET_PERIODIC_REPORT ((USAGE) 0x6e) +#define PID_USAGE_OFFSET ((USAGE) 0x6f) +#define PID_USAGE_MAGNITUDE ((USAGE) 0x70) +#define PID_USAGE_PHASE ((USAGE) 0x71) +#define PID_USAGE_PERIOD ((USAGE) 0x72) +#define PID_USAGE_SET_CONSTANT_FORCE_REPORT ((USAGE) 0x73) +#define PID_USAGE_SET_RAMP_FORCE_REPORT ((USAGE) 0x74) +#define PID_USAGE_RAMP_START ((USAGE) 0x75) +#define PID_USAGE_RAMP_END ((USAGE) 0x76) +#define PID_USAGE_EFFECT_OPERATION_REPORT ((USAGE) 0x77) +#define PID_USAGE_EFFECT_OPERATION ((USAGE) 0x78) +#define PID_USAGE_OP_EFFECT_START ((USAGE) 0x79) +#define PID_USAGE_OP_EFFECT_START_SOLO ((USAGE) 0x7a) +#define PID_USAGE_OP_EFFECT_STOP ((USAGE) 0x7b) +#define PID_USAGE_LOOP_COUNT ((USAGE) 0x7c) +#define PID_USAGE_DEVICE_GAIN_REPORT ((USAGE) 0x7d) +#define PID_USAGE_DEVICE_GAIN ((USAGE) 0x7e) +#define PID_USAGE_POOL_REPORT ((USAGE) 0x7f) +#define PID_USAGE_RAM_POOL_SIZE ((USAGE) 0x80) +#define PID_USAGE_ROM_POOL_SIZE ((USAGE) 0x81) +#define PID_USAGE_ROM_EFFECT_BLOCK_COUNT ((USAGE) 0x82) +#define PID_USAGE_SIMULTANEOUS_EFFECTS_MAX ((USAGE) 0x83) +#define PID_USAGE_POOL_ALIGNMENT ((USAGE) 0x84) +#define PID_USAGE_POOL_MOVE_REPORT ((USAGE) 0x85) +#define PID_USAGE_MOVE_SOURCE ((USAGE) 0x86) +#define PID_USAGE_MOVE_DESTINATION ((USAGE) 0x87) +#define PID_USAGE_MOVE_LENGTH ((USAGE) 0x88) +#define PID_USAGE_BLOCK_LOAD_REPORT ((USAGE) 0x89) +#define PID_USAGE_BLOCK_LOAD_STATUS ((USAGE) 0x8b) +#define PID_USAGE_BLOCK_LOAD_SUCCESS ((USAGE) 0x8c) +#define PID_USAGE_BLOCK_LOAD_FULL ((USAGE) 0x8d) +#define PID_USAGE_BLOCK_LOAD_ERROR ((USAGE) 0x8e) +#define PID_USAGE_BLOCK_HANDLE ((USAGE) 0x8f) +#define PID_USAGE_BLOCK_FREE_REPORT ((USAGE) 0x90) +#define PID_USAGE_TYPE_SPECIFIC_BLOCK_HANDLE ((USAGE) 0x91) +#define PID_USAGE_STATE_REPORT ((USAGE) 0x92) +#define PID_USAGE_EFFECT_PLAYING ((USAGE) 0x94) +#define PID_USAGE_DEVICE_CONTROL_REPORT ((USAGE) 0x95) +#define PID_USAGE_DEVICE_CONTROL ((USAGE) 0x96) +#define PID_USAGE_DC_ENABLE_ACTUATORS ((USAGE) 0x97) +#define PID_USAGE_DC_DISABLE_ACTUATORS ((USAGE) 0x98) +#define PID_USAGE_DC_STOP_ALL_EFFECTS ((USAGE) 0x99) +#define PID_USAGE_DC_DEVICE_RESET ((USAGE) 0x9a) +#define PID_USAGE_DC_DEVICE_PAUSE ((USAGE) 0x9b) +#define PID_USAGE_DC_DEVICE_CONTINUE ((USAGE) 0x9c) +#define PID_USAGE_DEVICE_PAUSED ((USAGE) 0x9f) +#define PID_USAGE_ACTUATORS_ENABLED ((USAGE) 0xa0) +#define PID_USAGE_SAFETY_SWITCH ((USAGE) 0xa4) +#define PID_USAGE_ACTUATOR_OVERRIDE_SWITCH ((USAGE) 0xa5) +#define PID_USAGE_ACTUATOR_POWER ((USAGE) 0xa6) +#define PID_USAGE_START_DELAY ((USAGE) 0xa7) +#define PID_USAGE_PARAMETER_BLOCK_SIZE ((USAGE) 0xa8) +#define PID_USAGE_DEVICE_MANAGED_POOL ((USAGE) 0xa9) +#define PID_USAGE_SHARED_PARAMETER_BLOCKS ((USAGE) 0xaa) +#define PID_USAGE_CREATE_NEW_EFFECT_REPORT ((USAGE) 0xab) +#define PID_USAGE_RAM_POOL_AVAILABLE ((USAGE) 0xac) + #endif /* __WINE_PARSE_H */

1 0

Rémi Bernon : include: Add IID_IDirectInputPIDDriver definition.
by Alexandre Julliard 29 Sep '21

29 Sep '21

Module: wine Branch: master Commit: d0a1ac332d8d3295c7260d68206f27d3e34ae722 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0a1ac332d8d3295c7260d68… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 29 10:24:55 2021 +0200 include: Add IID_IDirectInputPIDDriver definition. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dinputd.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/dinputd.h b/include/dinputd.h index 9c3b435cc6c..141e634b59d 100644 --- a/include/dinputd.h +++ b/include/dinputd.h @@ -27,6 +27,7 @@ #endif DEFINE_GUID(IID_IDirectInputJoyConfig8, 0xEB0D7DFA,0x1990,0x4F27,0xB4,0xD6,0xED,0xF2,0xEE,0xC4,0xA4,0x4C); +DEFINE_GUID(IID_IDirectInputPIDDriver, 0xeec6993a,0xb3fd,0x11d2,0xa9,0x16,0x00,0xc0,0x4f,0xb9,0x86,0x38); typedef struct IDirectInputJoyConfig8 *LPDIRECTINPUTJOYCONFIG8;

1 0

Rémi Bernon : dinput8/tests: Add a new force-feedback capable HID joystick test.
by Alexandre Julliard 29 Sep '21

29 Sep '21

Module: wine Branch: master Commit: 6c26901c933dd9f1e101a896282f22ac2e193f34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c26901c933dd9f1e101a896… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 29 10:24:56 2021 +0200 dinput8/tests: Add a new force-feedback capable HID joystick test. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 402 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 402 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6c26901c933dd9f1e101…

1 0

Huw Davies : secur32: Restore the done label.
by Alexandre Julliard 29 Sep '21

29 Sep '21

Module: wine Branch: master Commit: 1f0bc618eda7bc3f6eef3271d0fce32d4f009bc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f0bc618eda7bc3f6eef3271… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 29 07:53:54 2021 +0100 secur32: Restore the done label. This was incorrectly removed by commit 5c0fe4db7d580784ab6adc361bfed981be25753c. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_macosx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 523f8c63562..f7f7db955ef 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -1107,6 +1107,7 @@ static SECURITY_STATUS CDECL schan_get_session_peer_certificate(schan_session se CFRelease(data); } +done: CFRelease(cert_array); return ret; }

1 0

Alexandre Julliard : tools: Add a helper function to create temp files.
by Alexandre Julliard 29 Sep '21

29 Sep '21

Module: wine Branch: master Commit: 55701c66728f6f2589e8fb5c72506aa8ba9ace66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55701c66728f6f2589e8fb5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 29 09:32:01 2021 +0200 tools: Add a helper function to create temp files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/tools.h | 31 +++++++++++++++++++++++++++++++ tools/widl/parser.l | 10 ++-------- tools/widl/widl.c | 9 ++------- tools/winebuild/utils.c | 24 ++++++------------------ tools/winegcc/winegcc.c | 15 ++------------- tools/wrc/genres.c | 1 + tools/wrc/newstruc.c | 1 + tools/wrc/parser.l | 1 + tools/wrc/parser.y | 1 + tools/wrc/po.c | 1 + tools/wrc/ppl.l | 1 + tools/wrc/ppy.y | 1 + tools/wrc/translation.c | 1 + tools/wrc/utils.c | 1 + tools/wrc/wpp.c | 1 + tools/wrc/wpp_private.h | 1 - tools/wrc/wrc.c | 8 ++------ tools/wrc/wrc.h | 1 - 18 files changed, 55 insertions(+), 54 deletions(-) diff --git a/tools/tools.h b/tools/tools.h index 7c0f4c20a42..09b4fa14b28 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -26,6 +26,8 @@ #include <stdlib.h> #include <string.h> #include <sys/types.h> +#include <fcntl.h> +#include <time.h> #include <errno.h> #ifdef HAVE_UNISTD_H # include <unistd.h> @@ -249,4 +251,33 @@ static inline int strarray_spawn( struct strarray args ) #endif } +static inline int make_temp_file( const char *prefix, const char *suffix, char **name ) +{ + static unsigned int value; + int fd, count; + const char *tmpdir = NULL; + + if (!prefix) prefix = "tmp"; + if (!suffix) suffix = ""; + value += time(NULL) + getpid(); + + for (count = 0; count < 0x8000; count++) + { + if (tmpdir) + *name = strmake( "%s/%s-%08x%s", tmpdir, prefix, value, suffix ); + else + *name = strmake( "%s-%08x%s", prefix, value, suffix ); + fd = open( *name, O_RDWR | O_CREAT | O_EXCL, 0600 ); + if (fd >= 0) return fd; + value += 7777; + if (errno == EACCES && !tmpdir && !strchr( prefix, '/' )) + { + if (!(tmpdir = getenv("TMPDIR"))) tmpdir = "/tmp"; + } + free( *name ); + } + fprintf( stderr, "failed to create temp file for %s%s\n", prefix, suffix ); + exit(1); +} + #endif /* __WINE_TOOLS_H */ diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 72a7a432bbc..d01a9ece3bb 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -564,10 +564,7 @@ int do_import(char *fname) input_name = path; line_number = 1; - name = xstrdup( "widl.XXXXXX" ); - if((fd = mkstemps( name, 0 )) == -1) - error("Could not generate a temp name from %s\n", name); - + fd = make_temp_file( "widl-pp", NULL, &name ); temp_name = name; if (!(f = fdopen(fd, "wt"))) error("Could not open fd %s for writing\n", name); @@ -605,10 +602,7 @@ static void switch_to_acf(void) acf_name = NULL; line_number = 1; - name = xstrdup( "widl.XXXXXX" ); - if((fd = mkstemps( name, 0 )) == -1) - error("Could not generate a temp name from %s\n", name); - + fd = make_temp_file( "widl-acf", NULL, &name ); temp_name = name; if (!(f = fdopen(fd, "wt"))) error("Could not open fd %s for writing\n", name); diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 5b1ce6ca689..d168a01529a 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -967,14 +967,9 @@ int main(int argc,char *argv[]) { FILE *output; int fd; - char *name = xmalloc( strlen(header_name) + 8 ); - - strcpy( name, header_name ); - strcat( name, ".XXXXXX" ); - - if ((fd = mkstemps( name, 0 )) == -1) - error("Could not generate a temp name from %s\n", name); + char *name; + fd = make_temp_file( header_name, NULL, &name ); temp_name = name; if (!(output = fdopen(fd, "wt"))) error("Could not open fd %s for writing\n", name); diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index de0d26ddba6..e375b696e59 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -441,26 +441,14 @@ char *get_temp_file_name( const char *prefix, const char *suffix ) const char *ext, *basename; int fd; - if (!prefix || !prefix[0]) prefix = "winebuild"; - if (!suffix) suffix = ""; - if ((basename = strrchr( prefix, '/' ))) basename++; - else basename = prefix; - if (!(ext = strchr( basename, '.' ))) ext = prefix + strlen(prefix); - name = xmalloc( sizeof("/tmp/") + (ext - prefix) + sizeof(".XXXXXX") + strlen(suffix) ); - memcpy( name, prefix, ext - prefix ); - strcpy( name + (ext - prefix), ".XXXXXX" ); - strcat( name, suffix ); - - if ((fd = mkstemps( name, strlen(suffix) )) == -1) + if (prefix) { - strcpy( name, "/tmp/" ); - memcpy( name + 5, basename, ext - basename ); - strcpy( name + 5 + (ext - basename), ".XXXXXX" ); - strcat( name, suffix ); - if ((fd = mkstemps( name, strlen(suffix) )) == -1) - fatal_error( "could not generate a temp file\n" ); + if ((basename = strrchr( prefix, '/' ))) basename++; + else basename = prefix; + if ((ext = strchr( basename, '.' ))) prefix = strmake( "%.*s", ext - basename, basename ); + else prefix = basename; } - + fd = make_temp_file( prefix, suffix, &name ); close( fd ); strarray_add( &tmp_files, name ); return name; diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 2bf13570bba..0a6481ff0db 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -297,25 +297,14 @@ static void exit_on_signal( int sig ) static char* get_temp_file(const char* prefix, const char* suffix) { int fd; - char* tmp = strmake("%s-XXXXXX%s", prefix, suffix); + char *tmp; #ifdef HAVE_SIGPROCMASK sigset_t old_set; /* block signals while manipulating the temp files list */ sigprocmask( SIG_BLOCK, &signal_mask, &old_set ); #endif - fd = mkstemps( tmp, strlen(suffix) ); - if (fd == -1) - { - /* could not create it in current directory, try in TMPDIR */ - const char* tmpdir; - - free(tmp); - if (!(tmpdir = getenv("TMPDIR"))) tmpdir = "/tmp"; - tmp = strmake("%s/%s-XXXXXX%s", tmpdir, prefix, suffix); - fd = mkstemps( tmp, strlen(suffix) ); - if (fd == -1) error( "could not create temp file\n" ); - } + fd = make_temp_file( prefix, suffix, &tmp ); close( fd ); strarray_add(&tmp_files, tmp); #ifdef HAVE_SIGPROCMASK diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index bf2d3b5b9bc..002d1a46bfb 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -34,6 +34,7 @@ #include <assert.h> #include <ctype.h> +#include "../tools.h" #include "wrc.h" #include "genres.h" #include "utils.h" diff --git a/tools/wrc/newstruc.c b/tools/wrc/newstruc.c index e93545f04f6..1b6cd429609 100644 --- a/tools/wrc/newstruc.c +++ b/tools/wrc/newstruc.c @@ -27,6 +27,7 @@ #include <assert.h> #include <ctype.h> +#include "../tools.h" #include "wrc.h" #include "newstruc.h" #include "utils.h" diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index 0c71396de73..c5d9db1488f 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -111,6 +111,7 @@ ws [ \f\t\r] #define YY_NO_UNISTD_H #endif +#include "../tools.h" #include "wrc.h" #include "utils.h" #include "parser.h" diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index bde02b736f8..7daa4581f23 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -130,6 +130,7 @@ #include <ctype.h> #include <string.h> +#include "../tools.h" #include "wrc.h" #include "utils.h" #include "newstruc.h" diff --git a/tools/wrc/po.c b/tools/wrc/po.c index 622d2f7a3ad..423d7142145 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -31,6 +31,7 @@ #include <gettext-po.h> #endif +#include "../tools.h" #include "wrc.h" #include "genres.h" #include "newstruc.h" diff --git a/tools/wrc/ppl.l b/tools/wrc/ppl.l index bd29dd274a7..d4df76f7950 100644 --- a/tools/wrc/ppl.l +++ b/tools/wrc/ppl.l @@ -173,6 +173,7 @@ ul [uUlL]|[uUlL][lL]|[lL][uU]|[lL][lL][uU]|[uU][lL][lL]|[lL][uU][lL] #define YY_NO_UNISTD_H #endif +#include "../tools.h" #include "utils.h" #include "wpp_private.h" #include "ppy.tab.h" diff --git a/tools/wrc/ppy.y b/tools/wrc/ppy.y index 7dc75ac1965..50561cbe1aa 100644 --- a/tools/wrc/ppy.y +++ b/tools/wrc/ppy.y @@ -30,6 +30,7 @@ #include <ctype.h> #include <string.h> +#include "../tools.h" #include "utils.h" #include "wpp_private.h" diff --git a/tools/wrc/translation.c b/tools/wrc/translation.c index bdbcb4342bd..eb0047c10b5 100644 --- a/tools/wrc/translation.c +++ b/tools/wrc/translation.c @@ -21,6 +21,7 @@ #include <stdlib.h> #include <assert.h> +#include "../tools.h" #include "dumpres.h" #include "utils.h" #include "wrc.h" diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index b37463ee6bf..c335e9eaa10 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -28,6 +28,7 @@ #include <string.h> #include <ctype.h> +#include "../tools.h" #include "wrc.h" #include "utils.h" #include "parser.h" diff --git a/tools/wrc/wpp.c b/tools/wrc/wpp.c index 200b21f8a2a..392ef189754 100644 --- a/tools/wrc/wpp.c +++ b/tools/wrc/wpp.c @@ -34,6 +34,7 @@ # include <unistd.h> #endif +#include "../tools.h" #include "utils.h" #include "wpp_private.h" diff --git a/tools/wrc/wpp_private.h b/tools/wrc/wpp_private.h index be118b020bd..435dbcc005a 100644 --- a/tools/wrc/wpp_private.h +++ b/tools/wrc/wpp_private.h @@ -22,7 +22,6 @@ #include <stdio.h> #include <string.h> -#include "../tools.h" #include "wine/list.h" extern void wpp_del_define( const char *name ); diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 56c4c2f656b..1ffde86f0b7 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -35,6 +35,7 @@ # include <getopt.h> #endif +#include "../tools.h" #include "wrc.h" #include "utils.h" #include "dumpres.h" @@ -280,12 +281,7 @@ static int load_file( const char *input_name, const char *output_name ) exit(0); } - if (output_name && output_name[0]) name = strmake( "%s.XXXXXX", output_name ); - else name = xstrdup( "wrc.XXXXXX" ); - - if ((fd = mkstemps( name, 0 )) == -1) - error("Could not generate a temp name from %s\n", name); - + fd = make_temp_file( output_name, "", &name ); temp_name = name; if (!(output = fdopen(fd, "wt"))) error("Could not open fd %s for writing\n", name); diff --git a/tools/wrc/wrc.h b/tools/wrc/wrc.h index 4c572074e5e..d086c5c60f9 100644 --- a/tools/wrc/wrc.h +++ b/tools/wrc/wrc.h @@ -21,7 +21,6 @@ #ifndef __WRC_WRC_H #define __WRC_WRC_H -#include "../tools.h" #include "wrctypes.h" /* From wrc.c */

1 0

Alexandre Julliard : tools: Add a few helper functions for file names and extensions.
by Alexandre Julliard 29 Sep '21

29 Sep '21

Module: wine Branch: master Commit: 9e3959bd9b44c17f4d2cf0449ca78c35e7d9fd66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e3959bd9b44c17f4d2cf044… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 29 11:13:36 2021 +0200 tools: Add a few helper functions for file names and extensions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_xftmpl.c | 11 +------- tools/makedep.c | 17 ------------ tools/sfnt2fon/sfnt2fon.c | 12 ++------ tools/tools.h | 30 ++++++++++++++++++++ tools/widl/header.c | 7 ++--- tools/widl/parser.y | 2 +- tools/widl/typelib.c | 13 ++------- tools/widl/utils.c | 29 ------------------- tools/widl/utils.h | 1 - tools/widl/widl.c | 71 +++++++++++++---------------------------------- tools/winebuild/import.c | 4 +-- tools/winebuild/main.c | 6 ++-- tools/winebuild/utils.c | 9 +----- tools/winegcc/utils.c | 14 ---------- tools/winegcc/utils.h | 1 - tools/winegcc/winegcc.c | 45 ++++++++---------------------- tools/wmc/utils.c | 26 ----------------- tools/wmc/utils.h | 2 -- tools/wmc/wmc.c | 15 ++++------ tools/wrc/po.c | 5 +--- tools/wrc/utils.c | 26 ----------------- tools/wrc/utils.h | 1 - tools/wrc/wpp.c | 8 +----- tools/wrc/wrc.c | 15 ++++------ 24 files changed, 88 insertions(+), 282 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9e3959bd9b44c17f4d2c…

1 0

Alexandre Julliard : winedump: Use the shared tools functions.
by Alexandre Julliard 29 Sep '21

29 Sep '21

Module: wine Branch: master Commit: 3cdc6d682ceff3568d0e77f58772a266528f2bfa URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cdc6d682ceff3568d0e77f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 29 11:14:01 2021 +0200 winedump: Use the shared tools functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/debug.c | 5 +- tools/winedump/dump.c | 3 +- tools/winedump/main.c | 36 ++------- tools/winedump/misc.c | 74 +----------------- tools/winedump/msc.c | 11 +-- tools/winedump/msmangle.c | 190 +++++++++++++++++++++++----------------------- tools/winedump/nls.c | 7 +- tools/winedump/pdb.c | 5 +- tools/winedump/pe.c | 10 +-- tools/winedump/search.c | 23 +++--- tools/winedump/symbol.c | 3 +- tools/winedump/tlb.c | 5 +- tools/winedump/winedump.h | 4 - 13 files changed, 142 insertions(+), 234 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3cdc6d682ceff3568d0e…

1 0