February 2018 - Wine-Commits

Zebediah Figura : winegstreamer: Make sure the pipeline state is NULL before removing output pins.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 7bf59055cbb1df356f2ee45f47238e637583c5f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bf59055cbb1df356f2ee45f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 22 09:06:16 2018 -0600 winegstreamer: Make sure the pipeline state is NULL before removing output pins. Source pads can be created asynchronously, so they might not be created until during the call to gst_element_set_state(). Therefore don't copy This->ppPins into a local variable. This condition can be triggered by failing to demux a stream. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 8ccf0ad..518d995 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1913,7 +1913,6 @@ static HRESULT GST_RemoveOutputPins(GSTImpl *This) { HRESULT hr; ULONG i; - GSTOutPin **ppOldPins = This->ppPins; TRACE("(%p)\n", This); mark_wine_thread(); @@ -1927,17 +1926,17 @@ static HRESULT GST_RemoveOutputPins(GSTImpl *This) This->my_src = This->their_sink = NULL; for (i = 0; i < This->cStreams; i++) { - hr = BaseOutputPinImpl_BreakConnect(&ppOldPins[i]->pin); + hr = BaseOutputPinImpl_BreakConnect(&This->ppPins[i]->pin); TRACE("Disconnect: %08x\n", hr); - IPin_Release(&ppOldPins[i]->pin.pin.IPin_iface); + IPin_Release(&This->ppPins[i]->pin.pin.IPin_iface); } This->cStreams = 0; + CoTaskMemFree(This->ppPins); This->ppPins = NULL; gst_element_set_bus(This->container, NULL); gst_object_unref(This->container); This->container = NULL; BaseFilterImpl_IncrementPinVersion(&This->filter); - CoTaskMemFree(ppOldPins); return S_OK; }

1 0

Owen Rudge : wsdapi/tests: Add test for Publish.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 233d8244aebc7b23082b386004aaf27733c6dc6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=233d8244aebc7b23082b3860… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Feb 19 22:47:04 2018 +0000 wsdapi/tests: Add test for Publish. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/Makefile.in | 2 +- dlls/wsdapi/tests/discovery.c | 359 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 357 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=233d8244aebc7b23082b…

1 0

Nikolay Sivov : shell32: Use global memory allocation helpers.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: e3b200bd8a439a9e4b4d4313bb1551de8ef35dfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3b200bd8a439a9e4b4d4313… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 22 10:43:28 2018 +0300 shell32: Use global memory allocation helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/assoc.c | 36 +++++----- dlls/shell32/autocomplete.c | 33 +++++---- dlls/shell32/brsfolder.c | 12 ++-- dlls/shell32/control.c | 24 +++---- dlls/shell32/dataobject.c | 9 ++- dlls/shell32/dde.c | 58 +++++++-------- dlls/shell32/dialogs.c | 32 ++++----- dlls/shell32/ebrowser.c | 15 ++-- dlls/shell32/enumidlist.c | 4 +- dlls/shell32/folders.c | 13 ++-- dlls/shell32/iconcache.c | 26 +++---- dlls/shell32/pidl.c | 4 +- dlls/shell32/shell32_main.c | 24 +++---- dlls/shell32/shell32_main.h | 7 +- dlls/shell32/shelldispatch.c | 40 +++++------ dlls/shell32/shellitem.c | 38 +++++----- dlls/shell32/shelllink.c | 151 +++++++++++++++++++--------------------- dlls/shell32/shellole.c | 16 ++--- dlls/shell32/shellord.c | 16 ++--- dlls/shell32/shellpath.c | 64 ++++++++--------- dlls/shell32/shfldr_fs.c | 7 +- dlls/shell32/shfldr_netplaces.c | 4 +- dlls/shell32/shfldr_unixfs.c | 34 ++++----- dlls/shell32/shlexec.c | 90 ++++++++++++------------ dlls/shell32/shlfileop.c | 50 ++++++------- dlls/shell32/shlfsbind.c | 6 +- dlls/shell32/shlmenu.c | 31 +++++---- dlls/shell32/shlview.c | 8 +-- dlls/shell32/shlview_cmenu.c | 6 +- dlls/shell32/systray.c | 5 +- dlls/shell32/trash.c | 33 +++++---- dlls/shell32/xdg.c | 19 ++--- 32 files changed, 451 insertions(+), 464 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e3b200bd8a439a9e4b4d…

1 0

Owen Rudge : include: Define ipv6_mreq structure.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 3211de48397ea9f1f02865175c1826a7f7866a19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3211de48397ea9f1f0286517… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Feb 19 22:46:48 2018 +0000 include: Define ipv6_mreq structure. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ws2ipdef.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index e13cf6e..e4cbce1 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -152,6 +152,12 @@ typedef struct WS(ip_mreq) struct WS(in_addr) imr_interface; } WS(IP_MREQ), *WS(PIP_MREQ); +typedef struct WS(ipv6_mreq) +{ + struct WS(in6_addr) ipv6mr_multiaddr; + unsigned int ipv6mr_interface; +} WS(IPV6_MREQ), *WS(PIPV6_MREQ); + typedef struct WS(ip_mreq_source) { struct WS(in_addr) imr_multiaddr; struct WS(in_addr) imr_sourceaddr;

1 0

Alexandre Julliard : makefiles: Generate the top-level test rules from makedep.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 2b59daf32608902f5f0450aeb0719504884cdc72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b59daf32608902f5f0450ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 22 17:32:35 2018 +0100 makefiles: Generate the top-level test rules from makedep. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 18 +----------------- configure | 18 +----------------- tools/makedep.c | 25 +++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 34 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 4fc6cd4..830ec2f 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -309,23 +309,7 @@ wine_fn_config_test () wine_fn_append_file ALL_TEST_RESOURCES $ac_name.res wine_fn_all_rules - - wine_fn_append_rule \ -"$ac_dir: __builddeps__ -programs/winetest: $ac_dir -check test: $ac_dir/test -.PHONY: $ac_dir/test -$ac_dir/test: dummy - @cd $ac_dir && \$(MAKE) test" - - if test -n "$CROSSTARGET" - then - wine_fn_append_rule \ -"crosstest: $ac_dir/crosstest -.PHONY: $ac_dir/crosstest -$ac_dir/crosstest: __builddeps__ dummy - @cd $ac_dir && \$(MAKE) crosstest" - fi + wine_fn_append_rule "$ac_dir: __builddeps__" } wine_fn_config_tool () diff --git a/configure b/configure index 6c09a96..4dae327 100755 --- a/configure +++ b/configure @@ -7816,23 +7816,7 @@ fi wine_fn_append_file ALL_TEST_RESOURCES $ac_name.res wine_fn_all_rules - - wine_fn_append_rule \ -"$ac_dir: __builddeps__ -programs/winetest: $ac_dir -check test: $ac_dir/test -.PHONY: $ac_dir/test -$ac_dir/test: dummy - @cd $ac_dir && \$(MAKE) test" - - if test -n "$CROSSTARGET" - then - wine_fn_append_rule \ -"crosstest: $ac_dir/crosstest -.PHONY: $ac_dir/crosstest -$ac_dir/crosstest: __builddeps__ dummy - @cd $ac_dir && \$(MAKE) crosstest" - fi + wine_fn_append_rule "$ac_dir: __builddeps__" } wine_fn_config_tool () diff --git a/tools/makedep.c b/tools/makedep.c index b9f1948..a0b7ff5 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3406,6 +3406,8 @@ static void output_subdirs( struct makefile *make ) struct strarray testclean_files = empty_strarray; struct strarray distclean_files = empty_strarray; struct strarray tools_deps = empty_strarray; + struct strarray winetest_deps = empty_strarray; + struct strarray crosstest_deps = empty_strarray; unsigned int i, j; strarray_add( &tools_deps, tools_dir_path( make, "widl" )); @@ -3483,6 +3485,20 @@ static void output_subdirs( struct makefile *make ) } if (submake->disabled) continue; + if (submake->testdll) + { + output( "check test::\n" ); + output( "\t(a)cd %s && $(MAKE) test\n", subdir ); + strarray_add( &winetest_deps, subdir ); + if (crosstarget) + { + char *target = base_dir_path( submake, "crosstest" ); + output( "crosstest: %s\n", target ); + output( "%s: __builddeps__ dummy\n", target ); + output( "\t(a)cd %s && $(MAKE) crosstest\n", subdir ); + strarray_add( &crosstest_deps, target ); + } + } if (submake->install_rules[INSTALL_LIB].count) { output( "install install-lib:: %s\n", submake->base_dir ); @@ -3499,14 +3515,23 @@ static void output_subdirs( struct makefile *make ) output( "\n" ); output_filenames( makefile_deps ); output( ":\n" ); + output( "programs/winetest:" ); + output_filenames( winetest_deps ); + output( "\n" ); + output( "crosstest:" ); + output_filenames( crosstest_deps ); + output( "\n" ); output( "clean::\n"); output_rm_filenames( clean_files ); output( "testclean::\n"); output_rm_filenames( testclean_files ); output( "distclean::\n"); output_rm_filenames( distclean_files ); + strarray_add( &make->phony_targets, "check" ); + strarray_add( &make->phony_targets, "test" ); strarray_add( &make->phony_targets, "distclean" ); strarray_add( &make->phony_targets, "testclean" ); + strarray_addall( &make->phony_targets, crosstest_deps ); strarray_addall( &make->clean_files, symlinks ); strarray_addall( &build_deps, symlinks );

1 0

Nikolay Sivov : oleaut32: Ignore SetObjects() result when building property frame.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 8259f383f6c2abc649ceb13d13214788884d85df URL: https://source.winehq.org/git/wine.git/?a=commit;h=8259f383f6c2abc649ceb13d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 22 14:58:37 2018 +0300 oleaut32: Ignore SetObjects() result when building property frame. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/olepropframe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/olepropframe.c b/dlls/oleaut32/olepropframe.c index 98d2e8f..ecffdc9 100644 --- a/dlls/oleaut32/olepropframe.c +++ b/dlls/oleaut32/olepropframe.c @@ -288,7 +288,7 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) res = IPropertyPage_SetObjects(property_page[i], lpParams->cObjects, lpParams->lplpUnk); if(FAILED(res)) - continue; + WARN("SetObjects() failed, hr %#x.\n", res); res = IPropertyPage_GetPageInfo(property_page[i], &page_info); if(FAILED(res))

1 0

Fabian Maurer : uiribbon.idl: Add UIRibbonImageFromBitmapFactory coclass and more interface definitions.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: cdc179273d9498917a8dafca48ead35ee1d7189e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdc179273d9498917a8dafca… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Feb 18 15:30:55 2018 +0100 uiribbon.idl: Add UIRibbonImageFromBitmapFactory coclass and more interface definitions. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/uiribbon.idl | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) diff --git a/include/uiribbon.idl b/include/uiribbon.idl index 6759400..d67e5cd 100644 --- a/include/uiribbon.idl +++ b/include/uiribbon.idl @@ -64,6 +64,17 @@ typedef enum UI_COMMANDTYPE { UI_COMMANDTYPE_COLORCOLLECTION, } UI_COMMANDTYPE; +typedef [v1_enum] enum UI_OWNERSHIP { + UI_OWNERSHIP_TRANSFER = 0, + UI_OWNERSHIP_COPY = 1, +} UI_OWNERSHIP; + +typedef [v1_enum] enum UI_COLLECTIONCHANGE { + UI_COLLECTIONCHANGE_INSERT = 0, + UI_COLLECTIONCHANGE_REMOVE = 1, + UI_COLLECTIONCHANGE_REPLACE = 2, + UI_COLLECTIONCHANGE_RESET = 3 +} UI_COLLECTIONCHANGE; [ object, @@ -175,8 +186,125 @@ interface IUIFramework : IUnknown } [ + object, + uuid(23c8c838-4de6-436b-ab01-5554bb7c30dd), + local, + pointer_default(unique) +] +interface IUIImage : IUnknown +{ + HRESULT GetBitmap( + [out] HBITMAP *bitmap + ); +} + +[ + object, + uuid(803982ab-370a-4f7e-a9e7-8784036a6e26), + local, + pointer_default(unique) +] +interface IUIRibbon : IUnknown +{ + HRESULT GetHeight( + [out] UINT32 *cy + ); + HRESULT LoadSettingsFromStream( + [in] IStream *pStream + ); + HRESULT SaveSettingsToStream( + [in] IStream *pStream + ); +} + +[ + object, + uuid(df4f45bf-6f9d-4dd7-9d68-d8f9cd18c4db), + local, + pointer_default(unique) +] +interface IUICollection : IUnknown +{ + HRESULT GetCount( + [out] UINT32 *count + ); + HRESULT GetItem( + [in] UINT32 index, + [out] IUnknown **item + ); + HRESULT Add( + [in] IUnknown *item + ); + HRESULT Insert( + [in] UINT32 index, + [in] IUnknown *item + ); + HRESULT RemoveAt( + [in] UINT32 index + ); + HRESULT Replace( + [in] UINT32 indexReplaced, + [in] IUnknown *itemReplaceWith + ); + HRESULT Clear(); +} + +[ + object, + uuid(eea11f37-7c46-437c-8e55-b52122b29293), + local, + pointer_default(unique) +] +interface IUIContextualUI : IUnknown +{ + HRESULT ShowAtLocation( + [in] INT32 x, + [in] INT32 y + ); +} + +[ + object, + uuid(6502ae91-a14d-44b5-bbd0-62aacc581d52), + local, + pointer_default(unique) +] +interface IUICollectionChangedEvent : IUnknown +{ + HRESULT OnChanged( + [in] UI_COLLECTIONCHANGE action, + [in] UINT32 oldIndex, + [in] IUnknown *oldItem, + [in] UINT32 newIndex, + [in] IUnknown *newItem + ); +} + +[ + object, + uuid(18aba7f3-4c1c-4ba2-bf6c-f5c3326fa816), + local, + pointer_default(unique) +] +interface IUIImageFromBitmap : IUnknown +{ + HRESULT CreateImage( + [in] HBITMAP bitmap, + [in] UI_OWNERSHIP options, + [out] IUIImage **image + ); +} + + +[ helpstring("UIRibbonFramework Object"), threading(apartment), uuid(926749fa-2615-4987-8845-c33e65f2b957) ] coclass UIRibbonFramework { interface IUIFramework; } + +[ + threading(apartment), + uuid(0f7434b6-59b6-4250-999e-d168d6ae4293) +] +coclass UIRibbonImageFromBitmapFactory { interface IUIImageFromBitmap; }

1 0

Alexandre Julliard : makefiles: Generate the top-level install rules using the subdirs rules.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 733ed05650274a02a09ee0ae998ba2662252a25f URL: https://source.winehq.org/git/wine.git/?a=commit;h=733ed05650274a02a09ee0ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 22 14:34:56 2018 +0100 makefiles: Generate the top-level install rules using the subdirs rules. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 126 +++------------------ configure | 312 ++++++++++++++++++--------------------------------- configure.ac | 206 +++++++++++++++++----------------- tools/make_makefiles | 29 ----- tools/makedep.c | 93 +++++++++------ 5 files changed, 281 insertions(+), 485 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=733ed05650274a02a09e…

1 0

Alexandre Julliard : makefiles: Generate the remaining top-level rules from makedep.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: e91304e4165cd825f63b52105b3df8f70e0de54f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e91304e4165cd825f63b5210… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 22 18:17:46 2018 +0100 makefiles: Generate the remaining top-level rules from makedep. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 2 +- aclocal.m4 | 40 +++------------------------ configure | 48 +++++++-------------------------- tools/makedep.c | 83 ++++++++++++++++++++++++++++++++++++++++----------------- 4 files changed, 73 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e91304e4165cd825f63b…

1 0

Francois Gouget : krnl386.exe16: Avoid the DOSVM_HardwareInterruptPM() forward declaration.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: a52b257d56e5beed62bffe93dfd5be9d2b3c1670 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a52b257d56e5beed62bffe93… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 22 15:13:47 2018 +0100 krnl386.exe16: Avoid the DOSVM_HardwareInterruptPM() forward declaration. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/dosexe.h | 1 - dlls/krnl386.exe16/interrupts.c | 86 ++++++++++++++++++++--------------------- 2 files changed, 43 insertions(+), 44 deletions(-) diff --git a/dlls/krnl386.exe16/dosexe.h b/dlls/krnl386.exe16/dosexe.h index 8f9dc34..4a59cdf 100644 --- a/dlls/krnl386.exe16/dosexe.h +++ b/dlls/krnl386.exe16/dosexe.h @@ -275,7 +275,6 @@ extern void __wine_call_int_handler( CONTEXT *, BYTE ) DECLSPEC_HIDDEN; extern void DOSVM_CallBuiltinHandler( CONTEXT *, BYTE ) DECLSPEC_HIDDEN; extern BOOL DOSVM_EmulateInterruptPM( CONTEXT *, BYTE ) DECLSPEC_HIDDEN; extern FARPROC16 DOSVM_GetPMHandler16( BYTE ) DECLSPEC_HIDDEN; -extern void DOSVM_HardwareInterruptPM( CONTEXT *, BYTE ) DECLSPEC_HIDDEN; extern void DOSVM_SetPMHandler16( BYTE, FARPROC16 ) DECLSPEC_HIDDEN; /* ioports.c */ diff --git a/dlls/krnl386.exe16/interrupts.c b/dlls/krnl386.exe16/interrupts.c index 298f7e4..70690f6 100644 --- a/dlls/krnl386.exe16/interrupts.c +++ b/dlls/krnl386.exe16/interrupts.c @@ -178,6 +178,49 @@ static void DOSVM_PushFlags( CONTEXT *context, BOOL islong, BOOL isstub ) /********************************************************************** + * DOSVM_HardwareInterruptPM + * + * Emulate call to interrupt handler in 16-bit or 32-bit protected mode. + * + * Pushes interrupt frame to stack and changes instruction + * pointer to interrupt handler. + */ +void DOSVM_HardwareInterruptPM( CONTEXT *context, BYTE intnum ) +{ + FARPROC16 addr = DOSVM_GetPMHandler16( intnum ); + + if (SELECTOROF(addr) == DOSVM_dpmi_segments->int16_sel) + { + TRACE( "builtin interrupt %02x has been invoked " + "(through vector %02x)\n", + OFFSETOF(addr)/DOSVM_STUB_PM16, intnum ); + + if (intnum == 0x25 || intnum == 0x26) + DOSVM_PushFlags( context, FALSE, FALSE ); + + DOSVM_BuildCallFrame( context, + DOSVM_IntProcRelay, + DOSVM_GetBuiltinHandler( + OFFSETOF(addr)/DOSVM_STUB_PM16 ) ); + } + else + { + TRACE( "invoking hooked interrupt %02x at %04x:%04x\n", + intnum, SELECTOROF(addr), OFFSETOF(addr) ); + + /* Push the flags and return address on the stack */ + PUSH_WORD16( context, LOWORD(context->EFlags) ); + PUSH_WORD16( context, context->SegCs ); + PUSH_WORD16( context, LOWORD(context->Eip) ); + + /* Jump to the interrupt handler */ + context->SegCs = HIWORD(addr); + context->Eip = LOWORD(addr); + } +} + + +/********************************************************************** * DOSVM_EmulateInterruptPM * * Emulate software interrupt in 16-bit or 32-bit protected mode. @@ -244,49 +287,6 @@ BOOL DOSVM_EmulateInterruptPM( CONTEXT *context, BYTE intnum ) /********************************************************************** - * DOSVM_HardwareInterruptPM - * - * Emulate call to interrupt handler in 16-bit or 32-bit protected mode. - * - * Pushes interrupt frame to stack and changes instruction - * pointer to interrupt handler. - */ -void DOSVM_HardwareInterruptPM( CONTEXT *context, BYTE intnum ) -{ - FARPROC16 addr = DOSVM_GetPMHandler16( intnum ); - - if (SELECTOROF(addr) == DOSVM_dpmi_segments->int16_sel) - { - TRACE( "builtin interrupt %02x has been invoked " - "(through vector %02x)\n", - OFFSETOF(addr)/DOSVM_STUB_PM16, intnum ); - - if (intnum == 0x25 || intnum == 0x26) - DOSVM_PushFlags( context, FALSE, FALSE ); - - DOSVM_BuildCallFrame( context, - DOSVM_IntProcRelay, - DOSVM_GetBuiltinHandler( - OFFSETOF(addr)/DOSVM_STUB_PM16 ) ); - } - else - { - TRACE( "invoking hooked interrupt %02x at %04x:%04x\n", - intnum, SELECTOROF(addr), OFFSETOF(addr) ); - - /* Push the flags and return address on the stack */ - PUSH_WORD16( context, LOWORD(context->EFlags) ); - PUSH_WORD16( context, context->SegCs ); - PUSH_WORD16( context, LOWORD(context->Eip) ); - - /* Jump to the interrupt handler */ - context->SegCs = HIWORD(addr); - context->Eip = LOWORD(addr); - } -} - - -/********************************************************************** * DOSVM_GetPMHandler16 * * Return the protected mode interrupt vector for a given interrupt.

1 0