March 2019 - Wine-commits - list.winehq.org

Louis Lenders : uianimation.idl: Add more interfaces.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: 9bc28deffcc1ae621918c50975325a363c6f3515 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bc28deffcc1ae621918c509… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Mar 7 22:36:26 2019 +0100 uianimation.idl: Add more interfaces. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/uianimation.idl | 267 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 267 insertions(+) diff --git a/include/uianimation.idl b/include/uianimation.idl index 6c026a6..e8b366e 100644 --- a/include/uianimation.idl +++ b/include/uianimation.idl @@ -20,10 +20,19 @@ import "unknwn.idl"; interface IUIAnimationStoryboard; interface IUIAnimationVariable; +interface IUIAnimationManager; +interface IUIAnimationPriorityComparison; +interface IUIAnimationTransitionFactory; +interface IUIAnimationInterpolator; +interface IUIAnimationManagerEventHandler; +interface IUIAnimationTransition; +interface IUIAnimationTransitionLibrary; typedef DOUBLE UI_ANIMATION_SECONDS; typedef struct { int _; } *UI_ANIMATION_KEYFRAME; +const UI_ANIMATION_SECONDS UI_ANIMATION_SECONDS_EVENTUALLY = -1.0; + typedef enum { UI_ANIMATION_MANAGER_IDLE, @@ -76,6 +85,34 @@ typedef enum UI_ANIMATION_IDLE_BEHAVIOR_DISABLE, } UI_ANIMATION_IDLE_BEHAVIOR; +typedef [v1_enum] enum +{ + UI_ANIMATION_MODE_DISABLED, + UI_ANIMATION_MODE_SYSTEM_DEFAULT, + UI_ANIMATION_MODE_ENABLED +} UI_ANIMATION_MODE; + +typedef [v1_enum] enum +{ + UI_ANIMATION_PRIORITY_EFFECT_FAILURE, + UI_ANIMATION_PRIORITY_EFFECT_DELAY +} UI_ANIMATION_PRIORITY_EFFECT; + +typedef [v1_enum] enum +{ + UI_ANIMATION_DEPENDENCY_NONE = 0, + UI_ANIMATION_DEPENDENCY_INTERMEDIATE_VALUES = 0x1, + UI_ANIMATION_DEPENDENCY_FINAL_VALUE = 0x2, + UI_ANIMATION_DEPENDENCY_FINAL_VELOCITY = 0x4, + UI_ANIMATION_DEPENDENCY_DURATION = 0x8 +} UI_ANIMATION_DEPENDENCIES; + +typedef [v1_enum] enum +{ + UI_ANIMATION_SLOPE_INCREASING, + UI_ANIMATION_SLOPE_DECREASING +} UI_ANIMATION_SLOPE; + [ local, object, @@ -335,6 +372,212 @@ interface IUIAnimationTimer : IUnknown } [ + local, + object, + uuid(9169896c-ac8d-4e7d-94e5-67fa4dc2f2e8), + pointer_default(unique) +] +interface IUIAnimationManager : IUnknown +{ + HRESULT CreateAnimationVariable( + [in] UI_ANIMATION_SECONDS initialvalue, + [out, retval] IUIAnimationVariable **variable); + + HRESULT ScheduleTransition( + [in] IUIAnimationVariable *variable, + [in] IUIAnimationTransition *transition, + [in] UI_ANIMATION_SECONDS timenow); + + HRESULT CreateStoryboard( + [out, retval] IUIAnimationStoryboard **storyboard); + + HRESULT FinishAllStoryboards( + [in] UI_ANIMATION_SECONDS deadline); + + HRESULT AbandonAllStoryboards(); + + HRESULT Update( + [in] UI_ANIMATION_SECONDS timenow, + [out, defaultvalue(0)] UI_ANIMATION_UPDATE_RESULT *updateresult); + + HRESULT GetVariableFromTag( + [in] IUnknown * object, + [in] UINT32 id, + [out, retval] IUIAnimationVariable **variable); + + HRESULT GetStoryboardFromTag( + [in] IUnknown * object, + [in] UINT32 id, + [out, retval] IUIAnimationStoryboard **storyboard); + + HRESULT GetStatus( + [out, retval] UI_ANIMATION_MANAGER_STATUS *status); + + HRESULT SetAnimationMode( + [in] UI_ANIMATION_MODE mode); + + HRESULT Pause(); + + HRESULT Resume(); + + HRESULT SetManagerEventHandler( + [in] IUIAnimationManagerEventHandler *handler); + + HRESULT SetCancelPriorityComparison( + [in] IUIAnimationPriorityComparison *comparison); + + HRESULT SetTrimPriorityComparison( + [in] IUIAnimationPriorityComparison *comparison); + + HRESULT SetCompressPriorityComparison( + [in] IUIAnimationPriorityComparison *comparison); + + HRESULT SetConcludePriorityComparison( + [in] IUIAnimationPriorityComparison *comparison); + + HRESULT SetDefaultLongestAcceptableDelay( + [in] UI_ANIMATION_SECONDS delay); + + HRESULT Shutdown(); +} + +[ + local, + object, + uuid(83fa9b74-5f86-4618-bc6a-a2fac19b3f44), + pointer_default(unique) +] +interface IUIAnimationPriorityComparison : IUnknown +{ + HRESULT HasPriority( + [in] IUIAnimationStoryboard *scheduledboard, + [in] IUIAnimationStoryboard *newboard, + [in] UI_ANIMATION_PRIORITY_EFFECT effect); +} + +[ + local, + object, + uuid(fcd91e03-3e3b-45ad-bbb1-6dfc8153743d), + pointer_default(unique) +] +interface IUIAnimationTransitionFactory : IUnknown +{ + HRESULT CreateTransition( + [in] IUIAnimationInterpolator *interpolator, + [out, retval] IUIAnimationTransition **transition); +} + +[ + local, + object, + uuid(7815cbba-ddf7-478c-a46c-7b6c738b7978), + pointer_default(unique) +] +interface IUIAnimationInterpolator : IUnknown +{ + HRESULT SetInitialValueAndVelocity( + [in] double initialvalue, + [in] double initialvelocity); + + HRESULT SetDuration( + [in] UI_ANIMATION_SECONDS duration); + + HRESULT GetDuration( + [out, retval] UI_ANIMATION_SECONDS *duration); + + HRESULT GetFinalValue( + [out, retval] double *value); + + HRESULT InterpolateValue( + [in] UI_ANIMATION_SECONDS offset, + [out, retval] double *value); + + HRESULT InterpolateVelocity( + [in] UI_ANIMATION_SECONDS offset, + [out, retval] double *velocity); + + HRESULT GetDependencies( + [out] UI_ANIMATION_DEPENDENCIES *initialvaluedependencies, + [out] UI_ANIMATION_DEPENDENCIES *initialvelocitydependencies, + [out] UI_ANIMATION_DEPENDENCIES *durationdependencies); +} + +[ + local, + object, + uuid(ca5a14b1-d24f-48b8-8fe4-c78169ba954e), + pointer_default(unique) +] +interface IUIAnimationTransitionLibrary : IUnknown +{ + HRESULT CreateInstantaneousTransition( + [in] double finalvalue, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateConstantTransition( + [in] UI_ANIMATION_SECONDS duration, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateDiscreteTransition( + [in] UI_ANIMATION_SECONDS delay, + [in] double finalvalue, + [in] UI_ANIMATION_SECONDS hold, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateLinearTransition( + [in] UI_ANIMATION_SECONDS duration, + [in] double finalvalue, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateLinearTransitionFromSpeed( + [in] double speed, + [in] double finalvalue, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateSinusoidalTransitionFromVelocity( + [in] UI_ANIMATION_SECONDS duration, + [in] UI_ANIMATION_SECONDS period, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateSinusoidalTransitionFromRange( + [in] UI_ANIMATION_SECONDS duration, + [in] double minimumvalue, + [in] double maximumvalue, + [in] UI_ANIMATION_SECONDS period, + [in] UI_ANIMATION_SLOPE slope, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateAccelerateDecelerateTransition( + [in] UI_ANIMATION_SECONDS duration, + [in] double finalvalue, + [in] double accelerationratio, + [in] double decelerationratio, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateReversalTransition( + [in] UI_ANIMATION_SECONDS duration, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateCubicTransition( + [in] UI_ANIMATION_SECONDS duration, + [in] double finalvalue, + [in] double finalvelocity, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateSmoothStopTransition( + [in] UI_ANIMATION_SECONDS maximumduration, + [in] double finalvalue, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateParabolicTransitionFromAcceleration( + [in] UI_ANIMATION_SECONDS finalvalue, + [in] double finalvelocity, + [in] double acceleration, + [out, retval] IUIAnimationTransition **transition); +} + +[ uuid(44ca24db-1a92-4149-bab5-fb14d64b401e), version(1.0) ] @@ -347,4 +590,28 @@ library UIAnimation { [default] interface IUIAnimationTimer; } + + [ + uuid(4c1fc63a-695c-47e8-a339-1a194be3d0b8) + ] + coclass UIAnimationManager + { + [default] interface IUIAnimationManager; + } + + [ + uuid(8a9b1cdd-fcd7-419c-8b44-42fd17db1887) + ] + coclass UIAnimationTransitionFactory + { + [default] interface IUIAnimationTransitionFactory; + } + + [ + uuid(1d6322ad-aa85-4ef5-a828-86d71067d145) + ] + coclass UIAnimationTransitionLibrary + { + [default] interface IUIAnimationTransitionLibrary; + } }

1 0

Akihiro Sagawa : imm32: Correctly return the size of the required output buffer.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: d233a782950f41e80e68d2da2d1af3818e86e653 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d233a782950f41e80e68d2da… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Mar 17 23:29:29 2019 +0900 imm32: Correctly return the size of the required output buffer. This fixes a regression introduced by fd7cda93a33c9f65a6c1d1d530738c9fe4b9edf4. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46851 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 9 +++++++-- dlls/imm32/tests/imm32.c | 12 ++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index b462141..b2ac662 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1224,8 +1224,13 @@ static INT CopyCompStringIMEtoClient(const InputContextData *data, const void *s } else { - ret = min(src_len * char_size, dst_len); - memcpy(dst, src, ret); + if (dst_len) + { + ret = min(src_len * char_size, dst_len); + memcpy(dst, src, ret); + } + else + ret = src_len * char_size; } return ret; diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index d15fa9c..040a43f 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -473,6 +473,18 @@ static void test_ImmGetCompositionString(void) len = ImmGetCompositionStringW(imc, GCS_COMPSTR, wstring, wlen - 1); ok(len == wlen - 1, "Unexpected length %d.\n", len); ok(!memcmp(wstring, string, wlen - 1), "Unexpected buffer contents.\n"); + + /* Get the size of the required output buffer. */ + memset(wstring, 0x1a, sizeof(wstring)); + memset(cstring, 0x1a, sizeof(cstring)); + + len = ImmGetCompositionStringA(imc, GCS_COMPSTR, cstring, 0); + ok(len == alen, "Unexpected length %d.\n", len); + ok(cstring[0] == 0x1a, "Unexpected buffer contents %s.\n", cstring); + + len = ImmGetCompositionStringW(imc, GCS_COMPSTR, wstring, 0); + ok(len == wlen, "Unexpected length %d.\n", len); + ok(wstring[0] == 0x1a1a, "Unexpected buffer contents.\n"); } else win_skip("Composition string isn't available\n");

1 0

Alexandre Julliard : winebuild: Use proper RVAs for the export table on Windows.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: 265366c1e71de93fb23e6048288c87b9135e95b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=265366c1e71de93fb23e6048… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 19 10:02:02 2019 +0100 winebuild: Use proper RVAs for the export table on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/spec32.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 65c8d14..b4512f6 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -380,6 +380,7 @@ void output_exports( DLLSPEC *spec ) { int i, fwd_size = 0; int nr_exports = spec->base <= spec->limit ? spec->limit - spec->base + 1 : 0; + const char *func_ptr = (target_platform == PLATFORM_WINDOWS) ? ".rva" : get_asm_ptr_keyword(); if (!nr_exports) return; @@ -415,7 +416,8 @@ void output_exports( DLLSPEC *spec ) for (i = spec->base; i <= spec->limit; i++) { ORDDEF *odp = spec->ordinals[i]; - if (!odp) output( "\t%s 0\n", get_asm_ptr_keyword() ); + if (!odp) output( "\t%s 0\n", + (target_platform == PLATFORM_WINDOWS) ? ".long" : get_asm_ptr_keyword() ); else switch(odp->type) { case TYPE_EXTERN: @@ -424,22 +426,20 @@ void output_exports( DLLSPEC *spec ) case TYPE_CDECL: if (odp->flags & FLAG_FORWARD) { - output( "\t%s .L__wine_spec_forwards+%u\n", get_asm_ptr_keyword(), fwd_size ); + output( "\t%s .L__wine_spec_forwards+%u\n", func_ptr, fwd_size ); fwd_size += strlen(odp->link_name) + 1; } else if (odp->flags & FLAG_EXT_LINK) { - output( "\t%s %s_%s\n", - get_asm_ptr_keyword(), asm_name("__wine_spec_ext_link"), odp->link_name ); + output( "\t%s %s_%s\n", func_ptr, asm_name("__wine_spec_ext_link"), odp->link_name ); } else { - output( "\t%s %s\n", get_asm_ptr_keyword(), asm_name( get_link_name( odp ))); + output( "\t%s %s\n", func_ptr, asm_name( get_link_name( odp ))); } break; case TYPE_STUB: - output( "\t%s %s\n", get_asm_ptr_keyword(), - asm_name( get_stub_name( odp, spec )) ); + output( "\t%s %s\n", func_ptr, asm_name( get_stub_name( odp, spec )) ); break; default: assert(0);

1 0

Alexandre Julliard : makefiles: Pass --subsystem to the linker also.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: 3d7471570eb2a6d57701a45dc86685c109620e24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d7471570eb2a6d57701a45d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 19 15:25:19 2019 +0100 makefiles: Pass --subsystem to the linker also. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fltmgr.sys/Makefile.in | 2 +- dlls/mountmgr.sys/Makefile.in | 2 +- dlls/ndis.sys/Makefile.in | 2 +- dlls/scsiport.sys/Makefile.in | 2 +- dlls/tdi.sys/Makefile.in | 2 +- dlls/usbd.sys/Makefile.in | 2 +- dlls/winebus.sys/Makefile.in | 2 +- dlls/winehid.sys/Makefile.in | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/fltmgr.sys/Makefile.in b/dlls/fltmgr.sys/Makefile.in index 3fefde7..ba106a4 100644 --- a/dlls/fltmgr.sys/Makefile.in +++ b/dlls/fltmgr.sys/Makefile.in @@ -1,5 +1,5 @@ MODULE = fltmgr.sys -EXTRADLLFLAGS = -Wb,--subsystem,native +EXTRADLLFLAGS = -Wl,--subsystem,native C_SRCS = \ main.c diff --git a/dlls/mountmgr.sys/Makefile.in b/dlls/mountmgr.sys/Makefile.in index bd1c2ee..511484b 100644 --- a/dlls/mountmgr.sys/Makefile.in +++ b/dlls/mountmgr.sys/Makefile.in @@ -1,7 +1,7 @@ MODULE = mountmgr.sys IMPORTS = uuid advapi32 ntoskrnl DELAYIMPORTS = user32 -EXTRADLLFLAGS = -Wb,--subsystem,native +EXTRADLLFLAGS = -Wl,--subsystem,native EXTRAINCL = $(DBUS_CFLAGS) $(HAL_CFLAGS) EXTRALIBS = $(DISKARBITRATION_LIBS) diff --git a/dlls/ndis.sys/Makefile.in b/dlls/ndis.sys/Makefile.in index 33b1843..3b466ad 100644 --- a/dlls/ndis.sys/Makefile.in +++ b/dlls/ndis.sys/Makefile.in @@ -1,5 +1,5 @@ MODULE = ndis.sys -EXTRADLLFLAGS = -Wb,--subsystem,native +EXTRADLLFLAGS = -Wl,--subsystem,native C_SRCS = \ main.c diff --git a/dlls/scsiport.sys/Makefile.in b/dlls/scsiport.sys/Makefile.in index 5219c3e..ed9113a 100644 --- a/dlls/scsiport.sys/Makefile.in +++ b/dlls/scsiport.sys/Makefile.in @@ -1,6 +1,6 @@ MODULE = scsiport.sys IMPORTS = ntoskrnl -EXTRADLLFLAGS = -Wb,--subsystem,native +EXTRADLLFLAGS = -Wl,--subsystem,native C_SRCS = \ scsiport.c diff --git a/dlls/tdi.sys/Makefile.in b/dlls/tdi.sys/Makefile.in index 1b5f5f3..d414ff7 100644 --- a/dlls/tdi.sys/Makefile.in +++ b/dlls/tdi.sys/Makefile.in @@ -1,5 +1,5 @@ MODULE = tdi.sys -EXTRADLLFLAGS = -Wb,--subsystem,native +EXTRADLLFLAGS = -Wl,--subsystem,native C_SRCS = \ main.c diff --git a/dlls/usbd.sys/Makefile.in b/dlls/usbd.sys/Makefile.in index 32e7e71..d4e47a9 100644 --- a/dlls/usbd.sys/Makefile.in +++ b/dlls/usbd.sys/Makefile.in @@ -1,7 +1,7 @@ MODULE = usbd.sys IMPORTLIB = usbd IMPORTS = ntoskrnl -EXTRADLLFLAGS = -Wb,--subsystem,native +EXTRADLLFLAGS = -Wl,--subsystem,native C_SRCS = \ usbd.c diff --git a/dlls/winebus.sys/Makefile.in b/dlls/winebus.sys/Makefile.in index d3421b4..eda3c26 100644 --- a/dlls/winebus.sys/Makefile.in +++ b/dlls/winebus.sys/Makefile.in @@ -2,7 +2,7 @@ MODULE = winebus.sys IMPORTS = ntoskrnl setupapi EXTRALIBS = $(IOKIT_LIBS) $(UDEV_LIBS) EXTRAINCL = $(UDEV_CFLAGS) $(SDL2_CFLAGS) -EXTRADLLFLAGS = -Wb,--subsystem,native +EXTRADLLFLAGS = -Wl,--subsystem,native C_SRCS = \ bus_iohid.c \ diff --git a/dlls/winehid.sys/Makefile.in b/dlls/winehid.sys/Makefile.in index 8db0f0e..db2feb9 100644 --- a/dlls/winehid.sys/Makefile.in +++ b/dlls/winehid.sys/Makefile.in @@ -1,6 +1,6 @@ MODULE = winehid.sys IMPORTS = hidclass ntoskrnl -EXTRADLLFLAGS = -Wb,--subsystem,native +EXTRADLLFLAGS = -Wl,--subsystem,native C_SRCS = \ main.c

1 0

Erich E. Hoover : msidb: Permit specifying tables to import by filename.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: dcb3747f5eb4c8bf7ec1ae40a220399e628d7211 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcb3747f5eb4c8bf7ec1ae40… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Sat Mar 16 11:19:26 2019 -0600 msidb: Permit specifying tables to import by filename. msidb permits tables to be imported by filename (rather than just the name of the table) when the '.idt' extension is specified. This feature also allows specifying tables with long filenames: msidb -d package.msi -f . -i InstallExecuteSequence.idt Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/msidb/Makefile.in | 2 +- programs/msidb/main.c | 22 ++++++++++++++++------ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/programs/msidb/Makefile.in b/programs/msidb/Makefile.in index bb74041..5efb431 100644 --- a/programs/msidb/Makefile.in +++ b/programs/msidb/Makefile.in @@ -1,5 +1,5 @@ MODULE = msidb.exe APPMODE = -mconsole -municode -IMPORTS = msi +IMPORTS = msi shlwapi C_SRCS = main.c diff --git a/programs/msidb/main.c b/programs/msidb/main.c index 4bd065a..98ba133 100644 --- a/programs/msidb/main.c +++ b/programs/msidb/main.c @@ -24,6 +24,7 @@ #include <windows.h> #include <msi.h> #include <msiquery.h> +#include <shlwapi.h> #include "wine/debug.h" #include "wine/unicode.h" @@ -433,17 +434,14 @@ static int extract_streams( struct msidb_state *state ) return 1; } -static int import_table( struct msidb_state *state, const WCHAR *table_name ) +static int import_table( struct msidb_state *state, const WCHAR *table_path ) { - const WCHAR format[] = { '%','.','8','s','.','i','d','t',0 }; /* truncate to 8 characters */ - WCHAR table_path[MAX_PATH]; UINT ret; - snprintfW( table_path, ARRAY_SIZE(table_path), format, table_name ); ret = MsiDatabaseImportW( state->database_handle, state->table_folder, table_path ); if (ret != ERROR_SUCCESS) { - ERR( "Failed to import table '%s', error %d.\n", wine_dbgstr_w(table_name), ret ); + ERR( "Failed to import table '%s', error %d.\n", wine_dbgstr_w(table_path), ret ); return 0; } return 1; @@ -451,11 +449,23 @@ static int import_table( struct msidb_state *state, const WCHAR *table_name ) static int import_tables( struct msidb_state *state ) { + const WCHAR idt_ext[] = { '.','i','d','t',0 }; struct msidb_listentry *data; LIST_FOR_EACH_ENTRY( data, &state->table_list, struct msidb_listentry, entry ) { - if (!import_table( state, data->name )) + WCHAR *table_name = data->name; + WCHAR table_path[MAX_PATH]; + WCHAR *ext; + + /* permit specifying tables by filename (*.idt) */ + if ((ext = PathFindExtensionW( table_name )) == NULL || lstrcmpW( ext, idt_ext ) != 0) + { + const WCHAR format[] = { '%','.','8','s','.','i','d','t',0 }; /* truncate to 8 characters */ + snprintfW( table_path, ARRAY_SIZE(table_path), format, table_name ); + table_name = table_path; + } + if (!import_table( state, table_name )) return 0; /* failed, do not commit changes */ } return 1;

1 0

Erich E. Hoover : msidb: Add support for wildcard table import.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: 4e2f48ce2c504ca41e381fbbef2fa909c8a0c688 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e2f48ce2c504ca41e381fbb… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Sat Mar 16 21:15:39 2019 -0600 msidb: Add support for wildcard table import. msidb allows multiple tables to be imported with the use of standard wildcards. For example, both Feature and FeatureComponent tables can be imported simultaneously like so: msidb -d package.msi -f . -i 'Feature*' Please note that it is important to quote the wildcard to prevent files from being passed instead of the intended pattern. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/msidb/main.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/programs/msidb/main.c b/programs/msidb/main.c index 98ba133..36255c4 100644 --- a/programs/msidb/main.c +++ b/programs/msidb/main.c @@ -450,6 +450,7 @@ static int import_table( struct msidb_state *state, const WCHAR *table_path ) static int import_tables( struct msidb_state *state ) { const WCHAR idt_ext[] = { '.','i','d','t',0 }; + const WCHAR wildcard[] = { '*',0 }; struct msidb_listentry *data; LIST_FOR_EACH_ENTRY( data, &state->table_list, struct msidb_listentry, entry ) @@ -458,6 +459,41 @@ static int import_tables( struct msidb_state *state ) WCHAR table_path[MAX_PATH]; WCHAR *ext; + /* permit specifying tables with wildcards ('Feature*') */ + if (strstrW( table_name, wildcard ) != NULL) + { + WIN32_FIND_DATAW f; + HANDLE handle; + WCHAR *path; + DWORD len; + + len = strlenW( state->table_folder ) + 1 + strlenW( table_name ) + 1; /* %s/%s\0 */ + path = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + if (path == NULL) + return 0; + lstrcpyW( path, state->table_folder ); + PathAddBackslashW( path ); + lstrcatW( path, table_name ); + handle = FindFirstFileW( path, &f ); + HeapFree( GetProcessHeap(), 0, path ); + if (handle == INVALID_HANDLE_VALUE) + return 0; + do + { + if (f.cFileName[0] == '.' && !f.cFileName[1]) continue; + if (f.cFileName[0] == '.' && f.cFileName[1] == '.' && !f.cFileName[2]) continue; + if (f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) continue; + if ((ext = PathFindExtensionW( f.cFileName )) == NULL) continue; + if (lstrcmpW( ext, idt_ext ) != 0) continue; + if (!import_table( state, f.cFileName )) + { + FindClose( handle ); + return 0; /* failed, do not commit changes */ + } + } while (FindNextFileW( handle, &f )); + FindClose( handle ); + continue; + } /* permit specifying tables by filename (*.idt) */ if ((ext = PathFindExtensionW( table_name )) == NULL || lstrcmpW( ext, idt_ext ) != 0) {

1 0

Michael Stefaniuc : d3dx9: Move param_tree out of struct d3dx9_base_effect.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: adc1b5a8bc6bcce427e231485015da43d24ca5cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=adc1b5a8bc6bcce427e23148… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 19 08:51:25 2019 +0100 d3dx9: Move param_tree out of struct d3dx9_base_effect. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 3a8e152..c7b29ef 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -162,7 +162,6 @@ struct d3dx9_base_effect ULONG64 version_counter; - struct wine_rb_tree param_tree; char *full_name_tmp; unsigned int full_name_tmp_size; }; @@ -176,6 +175,7 @@ struct d3dx_effect unsigned int parameter_count; unsigned int object_count; struct d3dx_object *objects; + struct wine_rb_tree param_tree; struct ID3DXEffectStateManager *manager; struct IDirect3DDevice9 *device; @@ -903,6 +903,7 @@ static struct d3dx_parameter *get_annotation_by_name(struct d3dx_effect *effect, struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, struct d3dx_parameter *parameter, const char *name) { + struct d3dx_effect *effect = base->effect; struct d3dx_parameter *temp_parameter; unsigned int name_len, param_name_len; unsigned int i, count, length; @@ -917,7 +918,7 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, if (!parameter) { - if ((entry = wine_rb_get(&base->param_tree, name))) + if ((entry = wine_rb_get(&effect->param_tree, name))) return WINE_RB_ENTRY_VALUE(entry, struct d3dx_parameter, rb_entry); return NULL; } @@ -946,7 +947,7 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, memcpy(full_name + param_name_len + 1, name, name_len); full_name[param_name_len + 1 + name_len] = 0; - if ((entry = wine_rb_get(&base->param_tree, full_name))) + if ((entry = wine_rb_get(&effect->param_tree, full_name))) return WINE_RB_ENTRY_VALUE(entry, struct d3dx_parameter, rb_entry); return NULL; } @@ -5129,7 +5130,7 @@ static void add_param_to_tree(struct d3dx_effect *effect, struct d3dx_parameter memcpy(param->full_name, param->name, len); } TRACE("Full name is %s.\n", param->full_name); - wine_rb_put(&effect->base_effect.param_tree, param->full_name, &param->rb_entry); + wine_rb_put(&effect->param_tree, param->full_name, &param->rb_entry); if (is_top_level_parameter(param)) for (i = 0; i < param->top_level_param->annotation_count; ++i) @@ -5992,7 +5993,7 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U goto err_out; } - wine_rb_init(&base->param_tree, param_rb_compare); + wine_rb_init(&effect->param_tree, param_rb_compare); if (effect->parameter_count) { base->parameters = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,

1 0

Michael Stefaniuc : d3dx9: Move full_name_tmp out of struct d3dx9_base_effect.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: 3779ff07b048bfdaf67674db89aedaa1e4b1e810 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3779ff07b048bfdaf67674db… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 19 08:51:26 2019 +0100 d3dx9: Move full_name_tmp out of struct d3dx9_base_effect. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c7b29ef..5912e63 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -162,7 +162,6 @@ struct d3dx9_base_effect ULONG64 version_counter; - char *full_name_tmp; unsigned int full_name_tmp_size; }; @@ -176,6 +175,7 @@ struct d3dx_effect unsigned int object_count; struct d3dx_object *objects; struct wine_rb_tree param_tree; + char *full_name_tmp; struct ID3DXEffectStateManager *manager; struct IDirect3DDevice9 *device; @@ -690,7 +690,7 @@ static void d3dx9_base_effect_cleanup(struct d3dx_effect *effect) TRACE("base %p.\n", base); - heap_free(base->full_name_tmp); + heap_free(effect->full_name_tmp); if (base->parameters) { @@ -930,17 +930,17 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, full_name_size = name_len + param_name_len + 2; if (base->full_name_tmp_size < full_name_size) { - if (!(full_name = heap_realloc(base->full_name_tmp, full_name_size))) + if (!(full_name = heap_realloc(effect->full_name_tmp, full_name_size))) { ERR("Out of memory.\n"); return NULL; } - base->full_name_tmp = full_name; + effect->full_name_tmp = full_name; base->full_name_tmp_size = full_name_size; } else { - full_name = base->full_name_tmp; + full_name = effect->full_name_tmp; } memcpy(full_name, parameter->full_name, param_name_len); full_name[param_name_len] = '.';

1 0

Michael Stefaniuc : d3dx9: Move full_name_tmp_size out of struct d3dx9_base_effect.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: 0c6345322983ed3df9100b801aaa56367b37a501 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c6345322983ed3df9100b80… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 19 08:51:27 2019 +0100 d3dx9: Move full_name_tmp_size out of struct d3dx9_base_effect. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 5912e63..9986c8e 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -161,8 +161,6 @@ struct d3dx9_base_effect DWORD flags; ULONG64 version_counter; - - unsigned int full_name_tmp_size; }; struct d3dx_effect @@ -176,6 +174,7 @@ struct d3dx_effect struct d3dx_object *objects; struct wine_rb_tree param_tree; char *full_name_tmp; + unsigned int full_name_tmp_size; struct ID3DXEffectStateManager *manager; struct IDirect3DDevice9 *device; @@ -928,7 +927,7 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, name_len = strlen(name); param_name_len = strlen(parameter->full_name); full_name_size = name_len + param_name_len + 2; - if (base->full_name_tmp_size < full_name_size) + if (effect->full_name_tmp_size < full_name_size) { if (!(full_name = heap_realloc(effect->full_name_tmp, full_name_size))) { @@ -936,7 +935,7 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, return NULL; } effect->full_name_tmp = full_name; - base->full_name_tmp_size = full_name_size; + effect->full_name_tmp_size = full_name_size; } else {

1 0

Michael Stefaniuc : d3dx9: Pass a struct d3dx_effect to get_parameter_element_by_name().
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: 09770370c0b9159d3324684146544b6f441e4889 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09770370c0b9159d33246841… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 19 08:51:28 2019 +0100 d3dx9: Pass a struct d3dx_effect to get_parameter_element_by_name(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 9986c8e..8242b70 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -816,7 +816,7 @@ static void set_matrix_transpose(struct d3dx_parameter *param, const D3DXMATRIX } } -static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx9_base_effect *base, +static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx_effect *effect, struct d3dx_parameter *parameter, const char *name) { UINT element; @@ -838,7 +838,7 @@ static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx9_base_ef switch (*part++) { case '.': - return get_parameter_by_name(base, temp_parameter, part); + return get_parameter_by_name(&effect->base_effect, temp_parameter, part); case '\0': TRACE("Returning parameter %p\n", temp_parameter); @@ -886,7 +886,7 @@ static struct d3dx_parameter *get_annotation_by_name(struct d3dx_effect *effect, return get_parameter_by_name(base, temp_parameter, part); case '[': - return get_parameter_element_by_name(base, temp_parameter, part); + return get_parameter_element_by_name(effect, temp_parameter, part); default: FIXME("Unhandled case \"%c\"\n", *--part); @@ -975,7 +975,7 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, return get_parameter_by_name(base, temp_parameter, part); case '[': - return get_parameter_element_by_name(base, temp_parameter, part); + return get_parameter_element_by_name(effect, temp_parameter, part); default: FIXME("Unhandled case \"%c\"\n", *--part);

1 0