wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Hans Leidekker : msiexec: Fix parsing of basic UI level modifiers.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: 171a4c4154d031f240616e76be80ba8041342185 URL: http://source.winehq.org/git/wine.git/?a=commit;h=171a4c4154d031f240616e76b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 6 00:29:12 2015 +0200 msiexec: Fix parsing of basic UI level modifiers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- programs/msiexec/msiexec.c | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index cb0984d..bb5c931 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -886,10 +886,6 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine { InstallUILevel = INSTALLUILEVEL_NONE; } - else if(msi_strequal(argvW[i]+2, "b")) - { - InstallUILevel = INSTALLUILEVEL_BASIC; - } else if(msi_strequal(argvW[i]+2, "r")) { InstallUILevel = INSTALLUILEVEL_REDUCED; @@ -902,28 +898,25 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine { InstallUILevel = INSTALLUILEVEL_NONE|INSTALLUILEVEL_ENDDIALOG; } - else if(msi_strequal(argvW[i]+2, "b+")) - { - InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG; - } - else if(msi_strequal(argvW[i]+2, "b-")) - { - InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY; - } - else if(msi_strequal(argvW[i]+2, "b+!")) - { - WINE_FIXME("Unhandled modifier: !\n"); - InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG|INSTALLUILEVEL_HIDECANCEL; - } - else if(msi_strequal(argvW[i]+2, "b-!")) - { - WINE_FIXME("Unhandled modifier: !\n"); - InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY|INSTALLUILEVEL_HIDECANCEL; - } - else if(msi_strequal(argvW[i]+2, "b!")) + else if(msi_strprefix(argvW[i]+2, "b")) { - WINE_FIXME("Unhandled modifier: !\n"); - InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_HIDECANCEL; + const WCHAR *ptr = argvW[i] + 3; + + InstallUILevel = INSTALLUILEVEL_BASIC; + + while (*ptr) + { + if (msi_strprefix(ptr, "+")) + InstallUILevel |= INSTALLUILEVEL_ENDDIALOG; + if (msi_strprefix(ptr, "-")) + InstallUILevel |= INSTALLUILEVEL_PROGRESSONLY; + if (msi_strprefix(ptr, "!")) + { + WINE_FIXME("Unhandled modifier: !\n"); + InstallUILevel |= INSTALLUILEVEL_HIDECANCEL; + } + ptr++; + } } else {

1 0

Ken Thomases : winemac: Queue an event to reassert the WinAPI window position before Cocoa adjusts its position for a display change.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: 9372af77a546609b703070d60ef773d5ae7c2ddd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9372af77a546609b703070d60… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Oct 5 15:44:28 2015 -0500 winemac: Queue an event to reassert the WinAPI window position before Cocoa adjusts its position for a display change. When the display mode changes such that the screen height changes, we'd like our windows to keep their position relative to the top-left of the primary screen. That's how WinAPI's coordinate system works and we want the WinAPI position of the window to not change just because the display mode changed. Unfortunately that's not achievable in Cocoa. Cocoa keeps the window stationary relative to the screen it's on, not necessarily the primary screen, and it's sometimes relative to the bottom-left and sometimes the top-left of that screen. So, what we do instead is queue an event to get the back end to reassert the WinAPI position of the window. This is queued before Cocoa can adjust the Cocoa position of the window which would queue a WINDOW_FRAME_CHANGED to the back end and mess up the WinAPI position. The back end's reassertion of the WinAPI position won't be processed by the Cocoa thread until after Cocoa has adjusted the position and will thus override it. It will also discard any wrong WINDOW_FRAME_CHANGED that may have been queued. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/winemac.drv/cocoa_window.m | 37 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/event.c | 5 +++++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/window.c | 24 ++++++++++++++++++------ 5 files changed, 62 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 4ac03a7..35488b0 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -150,6 +150,11 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif } +@interface NSWindow (WineAccessPrivateMethods) + - (id) _displayChanged; +@end + + @interface WineContentView : NSView <NSTextInputClient> { NSMutableArray* glContexts; @@ -1593,6 +1598,38 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif return frameRect; } + // This private method of NSWindow is called as Cocoa reacts to the display + // configuration changing. Among other things, it adjusts the window's + // frame based on how the screen(s) changed size. That tells Wine that the + // window has been moved. We don't want that. Rather, we want to make + // sure that the WinAPI notion of the window position is maintained/ + // restored, possibly undoing or overriding Cocoa's adjustment. + // + // So, we queue a REASSERT_WINDOW_POSITION event to the back end before + // Cocoa has a chance to adjust the frame, thus preceding any resulting + // WINDOW_FRAME_CHANGED event that may get queued. The back end will + // reassert its notion of the position. That call won't get processed + // until after this method returns, so it will override whatever this + // method does to the window position. It will also discard any pending + // WINDOW_FRAME_CHANGED events. + // + // Unfortunately, the only way I've found to know when Cocoa is _about to_ + // adjust the window's position due to a display change is to hook into + // this private method. This private method has remained stable from 10.6 + // through 10.11. If it does change, the most likely thing is that it + // will be removed and no longer called and this fix will simply stop + // working. The only real danger would be if Apple changed the return type + // to a struct or floating-point type, which would change the calling + // convention. + - (id) _displayChanged + { + macdrv_event* event = macdrv_create_event(REASSERT_WINDOW_POSITION, self); + [queue postEvent:event]; + macdrv_release_event(event); + + return [super _displayChanged]; + } + - (BOOL) isExcludedFromWindowsMenu { return !([self collectionBehavior] & NSWindowCollectionBehaviorParticipatesInCycle); diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 58b507c..785bc0a 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -45,6 +45,7 @@ static const char *dbgstr_event(int type) "MOUSE_MOVED_ABSOLUTE", "MOUSE_SCROLL", "QUERY_EVENT", + "REASSERT_WINDOW_POSITION", "RELEASE_CAPTURE", "STATUS_ITEM_MOUSE_BUTTON", "STATUS_ITEM_MOUSE_MOVE", @@ -115,6 +116,7 @@ static macdrv_event_mask get_event_mask(DWORD mask) if (mask & QS_SENDMESSAGE) { event_mask |= event_mask_for_type(QUERY_EVENT); + event_mask |= event_mask_for_type(REASSERT_WINDOW_POSITION); event_mask |= event_mask_for_type(RELEASE_CAPTURE); event_mask |= event_mask_for_type(WINDOW_BROUGHT_FORWARD); event_mask |= event_mask_for_type(WINDOW_CLOSE_REQUESTED); @@ -237,6 +239,9 @@ void macdrv_handle_event(const macdrv_event *event) case QUERY_EVENT: macdrv_query_event(hwnd, event); break; + case REASSERT_WINDOW_POSITION: + macdrv_reassert_window_position(hwnd); + break; case RELEASE_CAPTURE: macdrv_release_capture(hwnd, event); break; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index a31d7e3..44b79ac 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -175,6 +175,7 @@ extern void macdrv_window_resize_ended(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_restore_requested(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_window_drag_begin(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_drag_end(HWND hwnd) DECLSPEC_HIDDEN; +extern void macdrv_reassert_window_position(HWND hwnd) DECLSPEC_HIDDEN; extern BOOL query_resize_size(HWND hwnd, macdrv_query *query) DECLSPEC_HIDDEN; extern BOOL query_resize_start(HWND hwnd) DECLSPEC_HIDDEN; extern BOOL query_min_max_info(HWND hwnd) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index d5e3f46..2385097 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -195,6 +195,7 @@ enum { MOUSE_MOVED_ABSOLUTE, MOUSE_SCROLL, QUERY_EVENT, + REASSERT_WINDOW_POSITION, RELEASE_CAPTURE, STATUS_ITEM_MOUSE_BUTTON, STATUS_ITEM_MOUSE_MOVE, diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 9d996ec..a48ac17 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1682,12 +1682,7 @@ LRESULT CDECL macdrv_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) macdrv_reset_device_metrics(); return 0; case WM_MACDRV_DISPLAYCHANGE: - if ((data = get_win_data(hwnd))) - { - if (data->cocoa_window && data->on_screen) - sync_window_position(data, SWP_NOZORDER | SWP_NOACTIVATE, NULL, NULL); - release_win_data(data); - } + macdrv_reassert_window_position(hwnd); SendMessageW(hwnd, WM_DISPLAYCHANGE, wp, lp); return 0; case WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS: @@ -2244,6 +2239,23 @@ void macdrv_window_drag_end(HWND hwnd) } +/*********************************************************************** + * macdrv_reassert_window_position + * + * Handler for REASSERT_WINDOW_POSITION events. + */ +void macdrv_reassert_window_position(HWND hwnd) +{ + struct macdrv_win_data *data = get_win_data(hwnd); + if (data) + { + if (data->cocoa_window && data->on_screen) + sync_window_position(data, SWP_NOZORDER | SWP_NOACTIVATE, NULL, NULL); + release_win_data(data); + } +} + + struct quit_info { HWND *wins; UINT capacity;

1 0

Andrew Eikum : xapofx1_2: Forward to xapofx1_5.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: 01a5e00479c1360596369892092a1f6a9cd11458 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01a5e00479c13605963698920… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 5 11:33:42 2015 -0500 xapofx1_2: Forward to xapofx1_5. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- configure | 2 ++ configure.ac | 1 + dlls/xapofx1_2/Makefile.in | 4 ++++ dlls/xapofx1_2/main.c | 45 +++++++++++++++++++++++++++++++++++++++++++ dlls/xapofx1_2/xapofx1_2.spec | 1 + 5 files changed, 53 insertions(+) diff --git a/configure b/configure index 34edcce..9cd9ca3 100755 --- a/configure +++ b/configure @@ -1371,6 +1371,7 @@ enable_x3daudio1_5 enable_x3daudio1_6 enable_x3daudio1_7 enable_xapofx1_1 +enable_xapofx1_2 enable_xapofx1_3 enable_xapofx1_4 enable_xapofx1_5 @@ -17914,6 +17915,7 @@ wine_fn_config_dll x3daudio1_5 enable_x3daudio1_5 wine_fn_config_dll x3daudio1_6 enable_x3daudio1_6 wine_fn_config_dll x3daudio1_7 enable_x3daudio1_7 wine_fn_config_dll xapofx1_1 enable_xapofx1_1 +wine_fn_config_dll xapofx1_2 enable_xapofx1_2 wine_fn_config_dll xapofx1_3 enable_xapofx1_3 wine_fn_config_dll xapofx1_4 enable_xapofx1_4 wine_fn_config_dll xapofx1_5 enable_xapofx1_5 diff --git a/configure.ac b/configure.ac index d350ea6..62abe1b 100644 --- a/configure.ac +++ b/configure.ac @@ -3457,6 +3457,7 @@ WINE_CONFIG_DLL(x3daudio1_5) WINE_CONFIG_DLL(x3daudio1_6) WINE_CONFIG_DLL(x3daudio1_7) WINE_CONFIG_DLL(xapofx1_1) +WINE_CONFIG_DLL(xapofx1_2) WINE_CONFIG_DLL(xapofx1_3) WINE_CONFIG_DLL(xapofx1_4) WINE_CONFIG_DLL(xapofx1_5) diff --git a/dlls/xapofx1_2/Makefile.in b/dlls/xapofx1_2/Makefile.in new file mode 100644 index 0000000..fb76b12 --- /dev/null +++ b/dlls/xapofx1_2/Makefile.in @@ -0,0 +1,4 @@ +MODULE = xapofx1_2.dll + +C_SRCS = \ + main.c diff --git a/dlls/xapofx1_2/main.c b/dlls/xapofx1_2/main.c new file mode 100644 index 0000000..e873b58 --- /dev/null +++ b/dlls/xapofx1_2/main.c @@ -0,0 +1,45 @@ +/* + * Copyright 2015 Andrew Eikum for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(xapofx); + +/***************************************************** + * DllMain + */ +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + TRACE("(%p, %d, %p)\n", hinst, reason, reserved); + + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinst); + break; + } + return TRUE; +} diff --git a/dlls/xapofx1_2/xapofx1_2.spec b/dlls/xapofx1_2/xapofx1_2.spec new file mode 100644 index 0000000..bc17511 --- /dev/null +++ b/dlls/xapofx1_2/xapofx1_2.spec @@ -0,0 +1 @@ +@ cdecl CreateFX(ptr ptr) xapofx1_5.CreateFX

1 0

Andrew Eikum : xapofx: Implement CreateFX.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: ad4ba76eb044a75b2a86a7738502a266caef2292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad4ba76eb044a75b2a86a7738… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 5 11:33:13 2015 -0500 xapofx: Implement CreateFX. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xapofx1_1/xapofx1_1.spec | 2 +- dlls/xapofx1_3/xapofx1_3.spec | 2 +- dlls/xapofx1_4/xapofx1_4.spec | 2 +- dlls/xapofx1_5/Makefile.in | 1 + dlls/xapofx1_5/main.c | 11 +++++++++++ dlls/xapofx1_5/xapofx1_5.spec | 2 +- 6 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/xapofx1_1/xapofx1_1.spec b/dlls/xapofx1_1/xapofx1_1.spec index 33269e3..bc17511 100644 --- a/dlls/xapofx1_1/xapofx1_1.spec +++ b/dlls/xapofx1_1/xapofx1_1.spec @@ -1 +1 @@ -@ stub CreateFX +@ cdecl CreateFX(ptr ptr) xapofx1_5.CreateFX diff --git a/dlls/xapofx1_3/xapofx1_3.spec b/dlls/xapofx1_3/xapofx1_3.spec index 33269e3..bc17511 100644 --- a/dlls/xapofx1_3/xapofx1_3.spec +++ b/dlls/xapofx1_3/xapofx1_3.spec @@ -1 +1 @@ -@ stub CreateFX +@ cdecl CreateFX(ptr ptr) xapofx1_5.CreateFX diff --git a/dlls/xapofx1_4/xapofx1_4.spec b/dlls/xapofx1_4/xapofx1_4.spec index 33269e3..bc17511 100644 --- a/dlls/xapofx1_4/xapofx1_4.spec +++ b/dlls/xapofx1_4/xapofx1_4.spec @@ -1 +1 @@ -@ stub CreateFX +@ cdecl CreateFX(ptr ptr) xapofx1_5.CreateFX diff --git a/dlls/xapofx1_5/Makefile.in b/dlls/xapofx1_5/Makefile.in index e0c6e9a..d243802 100644 --- a/dlls/xapofx1_5/Makefile.in +++ b/dlls/xapofx1_5/Makefile.in @@ -1,4 +1,5 @@ MODULE = xapofx1_5.dll +IMPORTS = ole32 C_SRCS = \ main.c diff --git a/dlls/xapofx1_5/main.c b/dlls/xapofx1_5/main.c index 1b223ad..4865d31 100644 --- a/dlls/xapofx1_5/main.c +++ b/dlls/xapofx1_5/main.c @@ -19,8 +19,13 @@ #include <stdarg.h> +#include "initguid.h" #include "windef.h" #include "winbase.h" +#include "compobj.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { @@ -35,3 +40,9 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } + +HRESULT CDECL CreateFX(REFCLSID clsid, IUnknown **out) +{ + TRACE("%s %p\n", debugstr_guid(clsid), out); + return CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)out); +} diff --git a/dlls/xapofx1_5/xapofx1_5.spec b/dlls/xapofx1_5/xapofx1_5.spec index 33269e3..9b768cb 100644 --- a/dlls/xapofx1_5/xapofx1_5.spec +++ b/dlls/xapofx1_5/xapofx1_5.spec @@ -1 +1 @@ -@ stub CreateFX +@ cdecl CreateFX(ptr ptr)

1 0

Andrew Eikum : xaudio2_1: Forward to xaudio2_7.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: 24a371c9d6917e87e8f6781a233286a3c04469f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24a371c9d6917e87e8f6781a2… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 5 11:33:09 2015 -0500 xaudio2_1: Forward to xaudio2_7. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- configure | 2 ++ configure.ac | 1 + dlls/xaudio2_1/Makefile.in | 7 ++++++ dlls/xaudio2_1/xaudio2_1.spec | 4 +++ dlls/xaudio2_1/xaudio_classes.idl | 28 +++++++++++++++++++++ dlls/xaudio2_1/xaudio_dll.c | 52 +++++++++++++++++++++++++++++++++++++++ include/xaudio2.idl | 7 ++++++ 7 files changed, 101 insertions(+) diff --git a/configure b/configure index 5b5000d..34edcce 100755 --- a/configure +++ b/configure @@ -1374,6 +1374,7 @@ enable_xapofx1_1 enable_xapofx1_3 enable_xapofx1_4 enable_xapofx1_5 +enable_xaudio2_1 enable_xaudio2_2 enable_xaudio2_3 enable_xaudio2_4 @@ -17916,6 +17917,7 @@ wine_fn_config_dll xapofx1_1 enable_xapofx1_1 wine_fn_config_dll xapofx1_3 enable_xapofx1_3 wine_fn_config_dll xapofx1_4 enable_xapofx1_4 wine_fn_config_dll xapofx1_5 enable_xapofx1_5 +wine_fn_config_dll xaudio2_1 enable_xaudio2_1 clean wine_fn_config_dll xaudio2_2 enable_xaudio2_2 clean wine_fn_config_dll xaudio2_3 enable_xaudio2_3 clean wine_fn_config_dll xaudio2_4 enable_xaudio2_4 clean diff --git a/configure.ac b/configure.ac index 51574db..d350ea6 100644 --- a/configure.ac +++ b/configure.ac @@ -3460,6 +3460,7 @@ WINE_CONFIG_DLL(xapofx1_1) WINE_CONFIG_DLL(xapofx1_3) WINE_CONFIG_DLL(xapofx1_4) WINE_CONFIG_DLL(xapofx1_5) +WINE_CONFIG_DLL(xaudio2_1,,[clean]) WINE_CONFIG_DLL(xaudio2_2,,[clean]) WINE_CONFIG_DLL(xaudio2_3,,[clean]) WINE_CONFIG_DLL(xaudio2_4,,[clean]) diff --git a/dlls/xaudio2_1/Makefile.in b/dlls/xaudio2_1/Makefile.in new file mode 100644 index 0000000..282513b --- /dev/null +++ b/dlls/xaudio2_1/Makefile.in @@ -0,0 +1,7 @@ +MODULE = xaudio2_1.dll +IMPORTS = ole32 + +C_SRCS = \ + xaudio_dll.c + +IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_1/xaudio2_1.spec b/dlls/xaudio2_1/xaudio2_1.spec new file mode 100644 index 0000000..cb263d4 --- /dev/null +++ b/dlls/xaudio2_1/xaudio2_1.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) xaudio2_7.DllGetClassObject +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xaudio2_1/xaudio_classes.idl b/dlls/xaudio2_1/xaudio_classes.idl new file mode 100644 index 0000000..de85c0b --- /dev/null +++ b/dlls/xaudio2_1/xaudio_classes.idl @@ -0,0 +1,28 @@ +/* + * COM Classes for xaudio + * + * Copyright 2015 Andrew Eikum for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep register + +[ + helpstring("XAudio2.1 Class"), + threading(both), + uuid(e21a7345-eb21-468e-be50-804db97cf708) +] +coclass XAudio21 { interface IXAudio22; } diff --git a/dlls/xaudio2_1/xaudio_dll.c b/dlls/xaudio2_1/xaudio_dll.c new file mode 100644 index 0000000..7c95c28 --- /dev/null +++ b/dlls/xaudio2_1/xaudio_dll.c @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2015 Andrew Eikum for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "rpcproxy.h" + +static HINSTANCE instance; + +BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + instance = hinstance; + DisableThreadLibraryCalls(hinstance); + break; + } + return TRUE; +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources(instance); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources(instance); +} diff --git a/include/xaudio2.idl b/include/xaudio2.idl index bd79718..5d4726a 100644 --- a/include/xaudio2.idl +++ b/include/xaudio2.idl @@ -31,6 +31,13 @@ coclass XAudio2 { } [ + uuid(e21a7345-eb21-468e-be50-804db97cf708) +] +coclass XAudio21 { + interface IUnknown; +} + +[ uuid(b802058a-464a-42db-bc10-b650d6f2586a) ] coclass XAudio22 {

1 0

Andrew Eikum : xaudio2_2: Add compatibility implementation and forward to xaudio2_7.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: 831095ed9335bd75f29ff3d2ab1233ead6935b92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=831095ed9335bd75f29ff3d2a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 5 11:33:03 2015 -0500 xaudio2_2: Add compatibility implementation and forward to xaudio2_7. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- configure | 2 + configure.ac | 1 + dlls/xaudio2_2/Makefile.in | 7 ++ dlls/xaudio2_2/xaudio2_2.spec | 4 + dlls/xaudio2_2/xaudio_classes.idl | 28 +++++ dlls/xaudio2_2/xaudio_dll.c | 52 ++++++++ dlls/xaudio2_7/compat.c | 252 ++++++++++++++++++++++++++++++++++++++ dlls/xaudio2_7/xaudio_classes.idl | 7 ++ dlls/xaudio2_7/xaudio_dll.c | 17 ++- dlls/xaudio2_7/xaudio_private.h | 3 + include/xaudio2.idl | 85 +++++++++++++ 11 files changed, 454 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=831095ed9335bd75f29ff…

1 0

Jacek Caban : mshtml: Updated nsIDocShellLoadInfo declaration to recent Wine Gecko version.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: d25737b38176edf918c6b89d384647b38b67d179 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d25737b38176edf918c6b89d3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 5 17:45:48 2015 +0200 mshtml: Updated nsIDocShellLoadInfo declaration to recent Wine Gecko version. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/nsiface.idl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 13c610f..c0b120c 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -3735,12 +3735,13 @@ interface nsIContentViewer : nsISupports [ object, - uuid(c8d3b1e1-565a-427e-9d68-b109910ce9b7), + uuid(c63e9d64-490d-48bf-8013-b5d8ee4dbc25), local ] interface nsIDocShellLoadInfo : nsISupports { - typedef int nsDocShellInfoLoadType; + typedef int32_t nsDocShellInfoLoadType; + typedef uint32_t nsDocShellInfoReferrerPolicy; nsresult GetReferrer(nsIURI **aReferrer); nsresult SetReferrer(nsIURI *aReferrer); @@ -3762,6 +3763,8 @@ interface nsIDocShellLoadInfo : nsISupports nsresult SetHeadersStream(nsIInputStream *aHeadersStream); nsresult GetSendReferrer(bool *aSendReferrer); nsresult SetSendReferrer(bool aSendReferrer); + nsresult GetReferrerPolicy(nsDocShellInfoReferrerPolicy *aReferrerPolicy); + nsresult SetReferrerPolicy(nsDocShellInfoReferrerPolicy aReferrerPolicy); nsresult GetIsSrcdocLoad(bool *aIsSrcdocLoad); nsresult GetSrcdocData(nsAString *aSrcdocData); nsresult SetSrcdocData(const nsAString *aSrcdocData);

1 0

Dmitry Timoshkov : oleaut32/tests: Add more tests for typelib data.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: e1760f84229abf107afa5414bb20251e01127951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1760f84229abf107afa5414b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 6 15:55:03 2015 +0800 oleaut32/tests: Add more tests for typelib data. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/tests/test_tlb.idl | 15 ++++++ dlls/oleaut32/tests/typelib.c | 111 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+) diff --git a/dlls/oleaut32/tests/test_tlb.idl b/dlls/oleaut32/tests/test_tlb.idl index fa084ec..8275c37 100644 --- a/dlls/oleaut32/tests/test_tlb.idl +++ b/dlls/oleaut32/tests/test_tlb.idl @@ -58,4 +58,19 @@ library Test IDispatch *disp; BSTR bstr; }; + + typedef [public] enum _a { a1, a2 } a; + typedef [public] enum aa { aa1, aa2 } aa; + typedef enum _b { b1, b2 } b; + typedef enum bb { bb1, bb2 } bb; + typedef [uuid(016fe2ec-b2c8-45f8-b23b-39e53a75396b)] enum _c { c1, c2 } c; + typedef [uuid(016fe2ec-b2c8-45f8-b23b-39e53a75396c)] enum cc { cc1, cc2 } cc; + + [uuid(ec5dfcd6-eeb0-4cd6-b51e-8030e1dac00a)] + interface ITestIface : IDispatch + { + HRESULT test1(a value); + HRESULT test2(b value); + HRESULT test3(c value); + } } diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index a9ef5fb..1d13b89 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4252,6 +4252,104 @@ static const type_info info[] = { "{4029f190-ca4a-4611-aeb9-673983cb96de}", /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct test_struct2), /*#vtbl*/ 0, /*#func*/ 0 +}, +{ + "a", + "{00000000-0000-0000-0000-000000000000}", + /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*#vtbl*/ 0, /*#func*/ 0 +}, +{ + "_a", + "{00000000-0000-0000-0000-000000000000}", + /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*#vtbl*/ 0, /*#func*/ 0 +}, +{ + "aa", + "{00000000-0000-0000-0000-000000000000}", + /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*#vtbl*/ 0, /*#func*/ 0 +}, +{ + "_b", + "{00000000-0000-0000-0000-000000000000}", + /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*#vtbl*/ 0, /*#func*/ 0 +}, +{ + "bb", + "{00000000-0000-0000-0000-000000000000}", + /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*#vtbl*/ 0, /*#func*/ 0 +}, +{ + "c", + "{016fe2ec-b2c8-45f8-b23b-39e53a75396b}", + /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*#vtbl*/ 0, /*#func*/ 0 +}, +{ + "_c", + "{00000000-0000-0000-0000-000000000000}", + /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*#vtbl*/ 0, /*#func*/ 0 +}, +{ + "cc", + "{00000000-0000-0000-0000-000000000000}", + /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*#vtbl*/ 0, /*#func*/ 0 +}, +{ + "ITestIface", + "{ec5dfcd6-eeb0-4cd6-b51e-8030e1dac00a}", + /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ 4, /*size*/ sizeof(ITestIface*), + /*#vtbl*/ 10, /*#func*/ 3, + { + { + /*id*/ 0x60020000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, + {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {VT_USERDEFINED, TKIND_ALIAS, PARAMFLAG_NONE}, + {-1, 0, 0} + }, + { /* names */ + "test1", + "value", + NULL, + }, + }, + { + /*id*/ 0x60020001, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 8, /*#scodes*/ 0, /*flags*/ 0, + {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {VT_USERDEFINED, TKIND_ENUM, PARAMFLAG_NONE}, + {-1, 0, 0} + }, + { /* names */ + "test2", + "value", + NULL, + }, + }, + { + /*id*/ 0x60020002, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 9, /*#scodes*/ 0, /*flags*/ 0, + {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {VT_USERDEFINED, TKIND_ALIAS, PARAMFLAG_NONE}, + {-1, 0, 0} + }, + { /* names */ + "test3", + "value", + NULL, + }, + }, + } } }; @@ -4286,8 +4384,21 @@ static void test_dump_typelib(const char *name) ole_check(ITypeInfo_GetTypeAttr(typeinfo, &typeattr)); expect_int(typeattr->typekind, ti->type); expect_hex(typeattr->wTypeFlags, ti->wTypeFlags); + /* FIXME: remove once widl is fixed */ + if (typeattr->typekind == TKIND_ALIAS) + { +todo_wine /* widl generates broken typelib and typeattr just reflects that */ + ok(typeattr->cbAlignment == ti->cbAlignment || broken(typeattr->cbAlignment == 1), + "expected %d, got %d\n", ti->cbAlignment, typeattr->cbAlignment); +todo_wine /* widl generates broken typelib and typeattr just reflects that */ + ok(typeattr->cbSizeInstance == ti->cbSizeInstance || broken(typeattr->cbSizeInstance == 0), + "expected %d, got %d\n", ti->cbSizeInstance, typeattr->cbSizeInstance); + } + else + { expect_int(typeattr->cbAlignment, ti->cbAlignment); expect_int(typeattr->cbSizeInstance, ti->cbSizeInstance); + } expect_int(typeattr->cbSizeVft, ti->cbSizeVft * sizeof(void*)); expect_int(typeattr->cFuncs, ti->cFuncs);

1 0

Dmitry Timoshkov : oleaut32/tests: Add a check for referenced type of VT_USERDEFINED parameters.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: 5081ce3e37e305246f462c4deaa0807818b09372 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5081ce3e37e305246f462c4de… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 5 20:36:25 2015 +0800 oleaut32/tests: Add a check for referenced type of VT_USERDEFINED parameters. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/tests/typelib.c | 121 ++++++++++++++++++++++++++++-------------- 1 file changed, 81 insertions(+), 40 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index dfc7bee..a9ef5fb 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -3929,6 +3929,30 @@ static const char *dump_func_flags(DWORD flags) return buf; } +static int get_href_type(ITypeInfo *info, TYPEDESC *tdesc) +{ + int href_type = -1; + + if (tdesc->vt == VT_USERDEFINED) + { + HRESULT hr; + ITypeInfo *param; + TYPEATTR *attr; + + hr = ITypeInfo_GetRefTypeInfo(info, U(*tdesc).hreftype, &param); + ok(hr == S_OK, "GetRefTypeInfo error %#x\n", hr); + hr = ITypeInfo_GetTypeAttr(param, &attr); + ok(hr == S_OK, "GetTypeAttr error %#x\n", hr); + + href_type = attr->typekind; + + ITypeInfo_ReleaseTypeAttr(param, attr); + ITypeInfo_Release(param); + } + + return href_type; +} + static void test_dump_typelib(const char *name) { WCHAR wszString[260]; @@ -3982,14 +4006,16 @@ static void test_dump_typelib(const char *name) map_value(desc->callconv, callconv_map)); printf(" /*#param*/ %d, /*#opt*/ %d, /*vtbl*/ %d, /*#scodes*/ %d, /*flags*/ %s,\n", desc->cParams, desc->cParamsOpt, desc->oVft/sizeof(void*), desc->cScodes, dump_func_flags(desc->wFuncFlags)); - printf(" {%s, %s}, /* ret */\n", map_value(desc->elemdescFunc.tdesc.vt, vt_map), dump_param_flags(U(desc->elemdescFunc).paramdesc.wParamFlags)); + printf(" {%s, %s, %s}, /* ret */\n", map_value(desc->elemdescFunc.tdesc.vt, vt_map), + map_value(get_href_type(info, &desc->elemdescFunc.tdesc), tkind_map), dump_param_flags(U(desc->elemdescFunc).paramdesc.wParamFlags)); printf(" { /* params */\n"); for (p = 0; p < desc->cParams; p++) { ELEMDESC e = desc->lprgelemdescParam[p]; - printf(" {%s, %s},\n", map_value(e.tdesc.vt, vt_map), dump_param_flags(U(e).paramdesc.wParamFlags)); + printf(" {%s, %s, %s},\n", map_value(e.tdesc.vt, vt_map), + map_value(get_href_type(info, &e.tdesc), tkind_map), dump_param_flags(U(e).paramdesc.wParamFlags)); } - printf(" {-1, -1}\n"); + printf(" {-1, 0, 0}\n"); printf(" },\n"); printf(" { /* names */\n"); OLE_CHECK(ITypeInfo_GetNames(info, desc->memid, tab, 256, &cNames)); @@ -4018,6 +4044,7 @@ static void test_dump_typelib(const char *name) typedef struct _element_info { VARTYPE vt; + TYPEKIND type; USHORT wParamFlags; } element_info; @@ -4061,11 +4088,11 @@ static const type_info info[] = { { /*id*/ 0x60000000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 2, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, - {VT_VOID, PARAMFLAG_NONE}, /* ret */ + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ { /* params */ - {VT_PTR, PARAMFLAG_FIN}, - {VT_PTR, PARAMFLAG_FOUT}, - {-1, -1} + {VT_PTR, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FOUT}, + {-1, 0, 0} }, { /* names */ "QueryInterface", @@ -4077,9 +4104,9 @@ static const type_info info[] = { { /*id*/ 0x60000001, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 1, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, - {VT_UI4, PARAMFLAG_NONE}, /* ret */ + {VT_UI4, -1, PARAMFLAG_NONE}, /* ret */ { /* params */ - {-1, -1} + {-1, 0, 0} }, { /* names */ "AddRef", @@ -4089,9 +4116,9 @@ static const type_info info[] = { { /*id*/ 0x60000002, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 2, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, - {VT_UI4, PARAMFLAG_NONE}, /* ret */ + {VT_UI4, -1, PARAMFLAG_NONE}, /* ret */ { /* params */ - {-1, -1} + {-1, 0, 0} }, { /* names */ "Release", @@ -4101,10 +4128,10 @@ static const type_info info[] = { { /*id*/ 0x60010000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 3, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, - {VT_VOID, PARAMFLAG_NONE}, /* ret */ + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ { /* params */ - {VT_PTR, PARAMFLAG_FOUT}, - {-1, -1} + {VT_PTR, -1, PARAMFLAG_FOUT}, + {-1, 0, 0} }, { /* names */ "GetTypeInfoCount", @@ -4115,12 +4142,12 @@ static const type_info info[] = { { /*id*/ 0x60010001, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 3, /*#opt*/ 0, /*vtbl*/ 4, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, - {VT_VOID, PARAMFLAG_NONE}, /* ret */ + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ { /* params */ - {VT_UINT, PARAMFLAG_FIN}, - {VT_UI4, PARAMFLAG_FIN}, - {VT_PTR, PARAMFLAG_FOUT}, - {-1, -1} + {VT_UINT, -1, PARAMFLAG_FIN}, + {VT_UI4, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FOUT}, + {-1, 0, 0} }, { /* names */ "GetTypeInfo", @@ -4133,14 +4160,14 @@ static const type_info info[] = { { /*id*/ 0x60010002, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 5, /*#opt*/ 0, /*vtbl*/ 5, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, - {VT_VOID, PARAMFLAG_NONE}, /* ret */ + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ { /* params */ - {VT_PTR, PARAMFLAG_FIN}, - {VT_PTR, PARAMFLAG_FIN}, - {VT_UINT, PARAMFLAG_FIN}, - {VT_UI4, PARAMFLAG_FIN}, - {VT_PTR, PARAMFLAG_FOUT}, - {-1, -1} + {VT_PTR, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FIN}, + {VT_UINT, -1, PARAMFLAG_FIN}, + {VT_UI4, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FOUT}, + {-1, 0, 0} }, { /* names */ "GetIDsOfNames", @@ -4155,17 +4182,17 @@ static const type_info info[] = { { /*id*/ 0x60010003, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 8, /*#opt*/ 0, /*vtbl*/ 6, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, - {VT_VOID, PARAMFLAG_NONE}, /* ret */ + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ { /* params */ - {VT_I4, PARAMFLAG_FIN}, - {VT_PTR, PARAMFLAG_FIN}, - {VT_UI4, PARAMFLAG_FIN}, - {VT_UI2, PARAMFLAG_FIN}, - {VT_PTR, PARAMFLAG_FIN}, - {VT_PTR, PARAMFLAG_FOUT}, - {VT_PTR, PARAMFLAG_FOUT}, - {VT_PTR, PARAMFLAG_FOUT}, - {-1, -1} + {VT_I4, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FIN}, + {VT_UI4, -1, PARAMFLAG_FIN}, + {VT_UI2, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FOUT}, + {VT_PTR, -1, PARAMFLAG_FOUT}, + {VT_PTR, -1, PARAMFLAG_FOUT}, + {-1, 0, 0} }, { /* names */ "Invoke", @@ -4183,9 +4210,9 @@ static const type_info info[] = { { /*id*/ 0x60020000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, - {VT_VOID, PARAMFLAG_NONE}, /* ret */ + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ { /* params */ - {-1, -1} + {-1, 0, 0} }, { /* names */ "Test", @@ -4203,9 +4230,9 @@ static const type_info info[] = { { /*id*/ 0x60020000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, - {VT_HRESULT, PARAMFLAG_NONE}, /* ret */ + {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ { /* params */ - {-1, -1} + {-1, 0, 0} }, { /* names */ "Test", @@ -4316,6 +4343,20 @@ static void test_dump_typelib(const char *name) for (i = 0 ; i < desc->cParams; i++) { check_type(&desc->lprgelemdescParam[i], &fn_info->params[i]); + + if (desc->lprgelemdescParam[i].tdesc.vt == VT_USERDEFINED) + { + ITypeInfo *param; + TYPEATTR *var_attr; + + ole_check(ITypeInfo_GetRefTypeInfo(typeinfo, U(desc->lprgelemdescParam[i].tdesc).hreftype, &param)); + ole_check(ITypeInfo_GetTypeAttr(param, &var_attr)); + + ok(var_attr->typekind == fn_info->params[i].type, "expected %#x, got %#x\n", fn_info->params[i].type, var_attr->typekind); + + ITypeInfo_ReleaseTypeAttr(param, var_attr); + ITypeInfo_Release(param); + } } expect_int(fn_info->params[desc->cParams].vt, (VARTYPE)-1);

1 0

Dmitry Timoshkov : oleaut32/tests: Replace magic values by symbolic names in the typelib data.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: 2ce0efd3b19a3e972874c21592908594939804b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ce0efd3b19a3e972874c2159… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 5 20:36:20 2015 +0800 oleaut32/tests: Replace magic values by symbolic names in the typelib data. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/tests/typelib.c | 213 +++++++++++++++++++++++++++++++++--------- 1 file changed, 170 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ce0efd3b19a3e972874c…

1 0

← Newer
1
...
59
60
61
62
63
64
65
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2015