March 2009 - Wine-Commits - list.winehq.org

Piotr Caban : mshtml: Added IHTMLWindow2_confirm implementation.
by Alexandre Julliard March 13, 2009

March 13, 2009

Module: wine Branch: master Commit: 3bc7bdab886033c4ff31809bb8741ecc5a6265d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bc7bdab886033c4ff31809bb… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Mar 12 19:08:30 2009 +0100 mshtml: Added IHTMLWindow2_confirm implementation. --- dlls/mshtml/htmlwindow.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index f143832..a928709 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -226,8 +226,25 @@ static HRESULT WINAPI HTMLWindow2_confirm(IHTMLWindow2 *iface, BSTR message, VARIANT_BOOL *confirmed) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(message), confirmed); - return E_NOTIMPL; + WCHAR wszTitle[100]; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(message), confirmed); + + if(!confirmed) return E_INVALIDARG; + + if(!LoadStringW(get_shdoclc(), IDS_MESSAGE_BOX_TITLE, wszTitle, + sizeof(wszTitle)/sizeof(WCHAR))) { + WARN("Could not load message box title: %d\n", GetLastError()); + *confirmed = VARIANT_TRUE; + return S_OK; + } + + if(MessageBoxW(This->doc->hwnd, message, wszTitle, + MB_OKCANCEL|MB_ICONQUESTION)==IDOK) + *confirmed = VARIANT_TRUE; + else *confirmed = VARIANT_FALSE; + + return S_OK; } typedef struct

1 0

Hans Leidekker : msi: Set concurrency model to multi-threaded for custom action threads.
by Alexandre Julliard March 13, 2009

March 13, 2009

Module: wine Branch: master Commit: ba50d15060b612420b8849ac337404b3c4331f71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba50d15060b612420b8849ac3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 13 14:48:00 2009 +0100 msi: Set concurrency model to multi-threaded for custom action threads. A custom action in the office 2007 sp1 installer fails right after calling CoInitializeEx(NULL, COINIT_MULTITHREADED). This is because our code calls CoInitialize(NULL) first, which sets a different concurrency model, and a subsequent call with a different model will return RPC_E_CHANGED_MODE. Ergo, we should set the model to multi-threaded too. --- dlls/msi/custom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 66a7ce6..ffac63f 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -695,7 +695,7 @@ static DWORD ACTION_CallDllFunction( const GUID *guid ) TRACE("calling %s\n", debugstr_w( function ) ); handle_msi_break( function ); - CoInitialize(NULL); + CoInitializeEx(NULL, COINIT_MULTITHREADED); __TRY {

1 0

Stefano Guidoni : msacm32: acmFormatEnum: Implement ACM_FORMATENUMF_SUGGEST .
by Alexandre Julliard March 13, 2009

March 13, 2009

Module: wine Branch: master Commit: 3a54e89ff8c682f97c66d6e9c034ca0cd53f96c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a54e89ff8c682f97c66d6e9c… Author: Stefano Guidoni <s.guidoni(a)tin.it> Date: Tue Mar 10 16:41:19 2009 +0100 msacm32: acmFormatEnum: Implement ACM_FORMATENUMF_SUGGEST. --- dlls/msacm32/format.c | 117 +++++++++++++++++++++++++++++++++--------------- 1 files changed, 80 insertions(+), 37 deletions(-) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index 0d5149c..1b20ce0 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -443,41 +443,85 @@ static BOOL MSACM_FormatEnumHelper(PWINE_ACMDRIVERID padid, HACMDRIVER had, ACMFORMATTAGDETAILSW aftd; unsigned int i, j; - for (i = 0; i < padid->cFormatTags; i++) { - memset(&aftd, 0, sizeof(aftd)); - aftd.cbStruct = sizeof(aftd); - aftd.dwFormatTagIndex = i; - if (acmFormatTagDetailsW(had, &aftd, ACM_FORMATTAGDETAILSF_INDEX) != MMSYSERR_NOERROR) - continue; - - if ((fdwEnum & ACM_FORMATENUMF_WFORMATTAG) && aftd.dwFormatTag != pwfxRef->wFormatTag) - continue; - - for (j = 0; j < aftd.cStandardFormats; j++) { - pafd->dwFormatIndex = j; - pafd->dwFormatTag = aftd.dwFormatTag; - if (acmFormatDetailsW(had, pafd, ACM_FORMATDETAILSF_INDEX) != MMSYSERR_NOERROR) - continue; - - if ((fdwEnum & ACM_FORMATENUMF_NCHANNELS) && - pafd->pwfx->nChannels != pwfxRef->nChannels) - continue; - if ((fdwEnum & ACM_FORMATENUMF_NSAMPLESPERSEC) && - pafd->pwfx->nSamplesPerSec != pwfxRef->nSamplesPerSec) - continue; - if ((fdwEnum & ACM_FORMATENUMF_WBITSPERSAMPLE) && - pafd->pwfx->wBitsPerSample != pwfxRef->wBitsPerSample) - continue; - if ((fdwEnum & ACM_FORMATENUMF_HARDWARE) && - !(pafd->fdwSupport & ACMDRIVERDETAILS_SUPPORTF_HARDWARE)) - continue; - - /* more checks to be done on fdwEnum */ - - if (!(fnCallback)((HACMDRIVERID)padid, pafd, dwInstance, padid->fdwSupport)) - return FALSE; - } - /* the "formats" used by the filters are also reported */ + if (fdwEnum & ACM_FORMATENUMF_SUGGEST) { + HDRVR hdrvr; + ACMDRVFORMATSUGGEST adfs; + pafd->dwFormatIndex = 0; + memset(&aftd, 0, sizeof(aftd)); + aftd.cbStruct = sizeof(aftd); + memset(&adfs, 0, sizeof(adfs)); + adfs.cbStruct = sizeof(adfs); + + for (i = 0; i < padid->cFormatTags; i++) { + aftd.dwFormatTag = i; + pafd->dwFormatTag = aftd.dwFormatTag; + pafd->pwfx->wFormatTag = pafd->dwFormatTag; + + if (acmFormatTagDetailsW(had, &aftd, ACM_FORMATTAGDETAILSF_INDEX) != MMSYSERR_NOERROR) + continue; + + adfs.cbwfxSrc = aftd.cbFormatSize; + adfs.cbwfxDst = aftd.cbFormatSize; + adfs.pwfxSrc = pwfxRef; + adfs.pwfxDst = pafd->pwfx; + pafd->fdwSupport = padid->fdwSupport; + + if ((fdwEnum & ACM_FORMATENUMF_WFORMATTAG) && + aftd.dwFormatTag != pwfxRef->wFormatTag) + continue; + + if ((fdwEnum & ACM_FORMATENUMF_HARDWARE) && + !(pafd->fdwSupport & ACMDRIVERDETAILS_SUPPORTF_HARDWARE)) + continue; + + hdrvr = OpenDriver(padid->pszFileName,0,0); + SendDriverMessage(hdrvr,ACMDM_FORMAT_SUGGEST,(DWORD)&adfs,(fdwEnum & 0x000000FFL)); + + if (acmFormatDetailsW(had, pafd, ACM_FORMATDETAILSF_FORMAT) != MMSYSERR_NOERROR) + continue; + + pafd->cbwfx = sizeof(*(pafd->pwfx)); + + if (!(fnCallback)((HACMDRIVERID)padid, pafd, dwInstance, padid->fdwSupport)) + return FALSE; + } + } else { + for (i = 0; i < padid->cFormatTags; i++) { + memset(&aftd, 0, sizeof(aftd)); + aftd.cbStruct = sizeof(aftd); + aftd.dwFormatTagIndex = i; + if (acmFormatTagDetailsW(had, &aftd, ACM_FORMATTAGDETAILSF_INDEX) != MMSYSERR_NOERROR) + continue; + + if ((fdwEnum & ACM_FORMATENUMF_WFORMATTAG) && aftd.dwFormatTag != pwfxRef->wFormatTag) + continue; + + for (j = 0; j < aftd.cStandardFormats; j++) { + pafd->dwFormatIndex = j; + pafd->dwFormatTag = aftd.dwFormatTag; + if (acmFormatDetailsW(had, pafd, ACM_FORMATDETAILSF_INDEX) != MMSYSERR_NOERROR) + continue; + + if ((fdwEnum & ACM_FORMATENUMF_NCHANNELS) && + pafd->pwfx->nChannels != pwfxRef->nChannels) + continue; + if ((fdwEnum & ACM_FORMATENUMF_NSAMPLESPERSEC) && + pafd->pwfx->nSamplesPerSec != pwfxRef->nSamplesPerSec) + continue; + if ((fdwEnum & ACM_FORMATENUMF_WBITSPERSAMPLE) && + pafd->pwfx->wBitsPerSample != pwfxRef->wBitsPerSample) + continue; + if ((fdwEnum & ACM_FORMATENUMF_HARDWARE) && + !(pafd->fdwSupport & ACMDRIVERDETAILS_SUPPORTF_HARDWARE)) + continue; + + /* more checks to be done on fdwEnum */ + + if (!(fnCallback)((HACMDRIVERID)padid, pafd, dwInstance, padid->fdwSupport)) + return FALSE; + } + /* the "formats" used by the filters are also reported */ + } } return TRUE; } @@ -514,8 +558,7 @@ MMRESULT WINAPI acmFormatEnumW(HACMDRIVER had, PACMFORMATDETAILSW pafd, (pafd->dwFormatTag != pafd->pwfx->wFormatTag)) return MMSYSERR_INVALPARAM; - if (fdwEnum & (ACM_FORMATENUMF_CONVERT|ACM_FORMATENUMF_SUGGEST| - ACM_FORMATENUMF_INPUT|ACM_FORMATENUMF_OUTPUT)) + if (fdwEnum & (ACM_FORMATENUMF_CONVERT|ACM_FORMATENUMF_INPUT|ACM_FORMATENUMF_OUTPUT)) FIXME("Unsupported fdwEnum values %08x\n", fdwEnum); if (had) {

1 0

Detlef Riekenberg : localspl: Return 0 for the local computer.
by Alexandre Julliard March 13, 2009

March 13, 2009

Module: wine Branch: master Commit: e1413faeb7097c6d1429d2309b9af63b8f247bd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1413faeb7097c6d1429d2309… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Mar 13 05:18:39 2009 +0100 localspl: Return 0 for the local computer. --- dlls/localspl/provider.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index dcb8b08..f308e36 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -251,25 +251,26 @@ static LONG copy_servername_from_name(LPCWSTR name, LPWSTR target) ptr = strchrW(server, '\\'); serverlen = (ptr) ? ptr - server : lstrlenW(server); - /* servername is empty or to long */ + /* servername is empty */ if (serverlen == 0) return 0; TRACE("found %s\n", debugstr_wn(server, serverlen)); if (serverlen > MAX_COMPUTERNAME_LENGTH) return -serverlen; + if (target) { + memcpy(target, server, serverlen * sizeof(WCHAR)); + target[serverlen] = '\0'; + } + len = sizeof(buffer) / sizeof(buffer[0]); if (GetComputerNameW(buffer, &len)) { if ((serverlen == len) && (strncmpiW(server, buffer, len) == 0)) { /* The requested Servername is our computername */ - if (target) { - memcpy(target, server, serverlen * sizeof(WCHAR)); - target[serverlen] = '\0'; - } - return serverlen; + return 0; } } - return 0; + return serverlen; } /******************************************************************

1 0

Aric Stewart : dinput: OS/X joystick: Sort buttons based on usage as some controllers report the buttons out of order .
by Alexandre Julliard March 13, 2009

March 13, 2009

Module: wine Branch: master Commit: 79859cb3ac62e6bc3866187605fcd1da19f8177f URL: http://source.winehq.org/git/wine.git/?a=commit;h=79859cb3ac62e6bc386618760… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Mar 12 08:03:04 2009 -0500 dinput: OS/X joystick: Sort buttons based on usage as some controllers report the buttons out of order. Makes the xbox 360 controller button mapping more logical. --- dlls/dinput/joystick_osx.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 21f8ca3..d5a5f17 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -284,6 +284,27 @@ static int get_osx_device_name(int id, char *name, int length) return 0; } +static void insert_sort_button(int header, IOHIDElementRef tIOHIDElementRef, + CFMutableArrayRef elementCFArrayRef, int index, + int target) +{ + IOHIDElementRef targetElement; + int usage; + + CFArraySetValueAtIndex(elementCFArrayRef, header+index, NULL); + targetElement = ( IOHIDElementRef ) CFArrayGetValueAtIndex( elementCFArrayRef, header+target); + if (targetElement == NULL) + { + CFArraySetValueAtIndex(elementCFArrayRef, header+target,tIOHIDElementRef); + return; + } + usage = IOHIDElementGetUsage( targetElement ); + usage --; /* usage 1 based index */ + + insert_sort_button(header, targetElement, elementCFArrayRef, target, usage); + CFArraySetValueAtIndex(elementCFArrayRef, header+target,tIOHIDElementRef); +} + static void get_osx_device_elements(JoystickImpl *device, int axis_map[8]) { IOHIDDeviceRef tIOHIDDeviceRef; @@ -382,6 +403,18 @@ static void get_osx_device_elements(JoystickImpl *device, int axis_map[8]) device->generic.devcaps.dwAxes = axes; device->generic.devcaps.dwButtons = buttons; device->generic.devcaps.dwPOVs = povs; + + /* Sort buttons into correct order */ + for (buttons = 0; buttons < device->generic.devcaps.dwButtons; buttons++) + { + IOHIDElementRef tIOHIDElementRef = ( IOHIDElementRef ) CFArrayGetValueAtIndex( device->elementCFArrayRef, axes+povs+buttons); + uint32_t usage = IOHIDElementGetUsage( tIOHIDElementRef ); + usage --; /* usage is 1 indexed we need 0 indexed */ + if (usage == buttons) + continue; + + insert_sort_button(axes+povs, tIOHIDElementRef, device->elementCFArrayRef,buttons,usage); + } } static void get_osx_device_elements_props(JoystickImpl *device)

1 0

Hans Leidekker : msi: Handle ADVERTISE overrides.
by Alexandre Julliard March 13, 2009

March 13, 2009

Module: wine Branch: master Commit: 4da865f324aacc722c04d0e42da10e4aca6e5460 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4da865f324aacc722c04d0e42… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 13 11:34:46 2009 +0100 msi: Handle ADVERTISE overrides. --- dlls/msi/action.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index ba2e802..49f7298 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1841,6 +1841,8 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) {'R','E','M','O','V','E',0}; static const WCHAR szReinstall[] = {'R','E','I','N','S','T','A','L','L',0}; + static const WCHAR szAdvertise[] = + {'A','D','V','E','R','T','I','S','E',0}; BOOL override = FALSE; MSICOMPONENT* component; MSIFEATURE *feature; @@ -1855,12 +1857,13 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) /* ok here is the _real_ rub * all these activation/deactivation things happen in order and things * later on the list override things earlier on the list. - * 1) INSTALLLEVEL processing - * 2) ADDLOCAL - * 3) REMOVE - * 4) ADDSOURCE - * 5) ADDDEFAULT - * 6) REINSTALL + * 0) INSTALLLEVEL processing + * 1) ADDLOCAL + * 2) REMOVE + * 3) ADDSOURCE + * 4) ADDDEFAULT + * 5) REINSTALL + * 6) ADVERTISE * 7) COMPADDLOCAL * 8) COMPADDSOURCE * 9) FILEADDLOCAL @@ -1875,6 +1878,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) override |= process_state_property(package, level, szRemove, INSTALLSTATE_ABSENT); override |= process_state_property(package, level, szAddSource, INSTALLSTATE_SOURCE); override |= process_state_property(package, level, szReinstall, INSTALLSTATE_UNKNOWN); + override |= process_state_property(package, level, szAdvertise, INSTALLSTATE_ADVERTISED); if (!override) {

1 0

Hans Leidekker : msi: Correct spec entry for MsiGetProductInfoA/W.
by Alexandre Julliard March 13, 2009

March 13, 2009

Module: wine Branch: master Commit: 804d66039dbedf141f233dcc110b1ade0848b8da URL: http://source.winehq.org/git/wine.git/?a=commit;h=804d66039dbedf141f233dcc1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 13 11:34:16 2009 +0100 msi: Correct spec entry for MsiGetProductInfoA/W. --- dlls/msi/msi.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 902e5f8..e1644be 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -60,10 +60,10 @@ 64 stdcall MsiGetMode(long long) 65 stdcall MsiGetProductCodeA(str str) 66 stdcall MsiGetProductCodeW(wstr wstr) -67 stdcall MsiGetProductInfoA(str str str long) +67 stdcall MsiGetProductInfoA(str str ptr long) 68 stub MsiGetProductInfoFromScriptA 69 stub MsiGetProductInfoFromScriptW -70 stdcall MsiGetProductInfoW(wstr wstr wstr long) +70 stdcall MsiGetProductInfoW(wstr wstr ptr long) 71 stdcall MsiGetProductPropertyA(long str ptr ptr) 72 stdcall MsiGetProductPropertyW(long wstr ptr ptr) 73 stdcall MsiGetPropertyA(ptr str ptr ptr)

1 0

Alexandre Julliard : make_makefiles: Automatically disable 16-bit modules if enable_win16 isn't set.
by Alexandre Julliard March 13, 2009

March 13, 2009

Module: wine Branch: master Commit: a37d88973c4318f19e1842477e9dba4964bf07e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a37d88973c4318f19e1842477… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 13 12:18:04 2009 +0100 make_makefiles: Automatically disable 16-bit modules if enable_win16 isn't set. --- configure | 96 ++++++++++++++++--------------------------------- configure.ac | 96 ++++++++++++++++--------------------------------- tools/make_makefiles | 7 +++- 3 files changed, 70 insertions(+), 129 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a37d88973c4318f19e184…

1 0

Alexandre Julliard : winedos: Don't create an import library.
by Alexandre Julliard March 13, 2009

March 13, 2009

Module: wine Branch: master Commit: c4c2d9807a2f0c965d195d46681b2bb46f8c13e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4c2d9807a2f0c965d195d466… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 13 12:00:02 2009 +0100 winedos: Don't create an import library. --- dlls/Makefile.in | 5 ----- dlls/winedos/Makefile.in | 1 - 2 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index c08ce74..8898657 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -261,7 +261,6 @@ IMPORT_LIBS = \ vdmdbg/libvdmdbg.$(IMPLIBEXT) \ version/libversion.$(IMPLIBEXT) \ wined3d/libwined3d.$(IMPLIBEXT) \ - winedos/libwinedos.$(IMPLIBEXT) \ winhttp/libwinhttp.$(IMPLIBEXT) \ wininet/libwininet.$(IMPLIBEXT) \ winmm/libwinmm.$(IMPLIBEXT) \ @@ -405,7 +404,6 @@ CROSS_IMPLIBS = \ vdmdbg/libvdmdbg.a \ version/libversion.a \ wined3d/libwined3d.a \ - winedos/libwinedos.a \ winhttp/libwinhttp.a \ wininet/libwininet.a \ winmm/libwinmm.a \ @@ -805,9 +803,6 @@ version/libversion.def version/libversion.a: version/version.spec $(WINEBUILD) wined3d/libwined3d.def wined3d/libwined3d.a: wined3d/wined3d.spec $(WINEBUILD) @cd wined3d && $(MAKE) `basename $@` -winedos/libwinedos.def winedos/libwinedos.a: winedos/winedos.spec $(WINEBUILD) - @cd winedos && $(MAKE) `basename $@` - winhttp/libwinhttp.def winhttp/libwinhttp.a: winhttp/winhttp.spec $(WINEBUILD) @cd winhttp && $(MAKE) `basename $@` diff --git a/dlls/winedos/Makefile.in b/dlls/winedos/Makefile.in index 50ce888..ede4c7c 100644 --- a/dlls/winedos/Makefile.in +++ b/dlls/winedos/Makefile.in @@ -3,7 +3,6 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winedos.dll -IMPORTLIB = winedos IMPORTS = user32 kernel32 ntdll SPEC_SRCS16 = wprocs.spec

1 0

Alexandre Julliard : vwin32.vxd: Load winedos dynamically.
by Alexandre Julliard March 13, 2009

March 13, 2009

Module: wine Branch: master Commit: 50c747388254a33526c20d8f672edc7a09eca3b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50c747388254a33526c20d8f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 13 11:59:48 2009 +0100 vwin32.vxd: Load winedos dynamically. --- dlls/vwin32.vxd/Makefile.in | 2 +- dlls/vwin32.vxd/vwin32.c | 35 ++++++++++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/vwin32.vxd/Makefile.in b/dlls/vwin32.vxd/Makefile.in index b7236a0..128ac90 100644 --- a/dlls/vwin32.vxd/Makefile.in +++ b/dlls/vwin32.vxd/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = vwin32.vxd -IMPORTS = winedos kernel32 +IMPORTS = kernel32 C_SRCS = \ vwin32.c diff --git a/dlls/vwin32.vxd/vwin32.c b/dlls/vwin32.vxd/vwin32.c index 7e070d1..ba78f74 100644 --- a/dlls/vwin32.vxd/vwin32.c +++ b/dlls/vwin32.vxd/vwin32.c @@ -55,7 +55,22 @@ typedef struct tagMID { } MID, *PMID; #include <poppack.h> -extern void WINAPI CallBuiltinHandler( CONTEXT86 *context, BYTE intnum ); /* from winedos */ +typedef void (WINAPI *CallBuiltinHandler)( CONTEXT *context, BYTE intnum ); + +static CallBuiltinHandler load_builtin_handler(void) +{ + static CallBuiltinHandler handler; + static BOOL init_done; + + if (!init_done) + { + HMODULE mod = LoadLibraryA( "winedos.dll" ); + if (mod) handler = (void *)GetProcAddress( mod, "CallBuiltinHandler" ); + if (!handler) FIXME( "DOS calls not supported\n" ); + init_done = TRUE; + } + return handler; +} /* Pop a DWORD from the 32-bit stack */ static inline DWORD stack32_pop( CONTEXT86 *context ) @@ -121,6 +136,13 @@ BOOL WINAPI VWIN32_DeviceIoControl(DWORD dwIoControlCode, DIOC_REGISTERS *pIn = lpvInBuffer; DIOC_REGISTERS *pOut = lpvOutBuffer; BYTE intnum = 0; + CallBuiltinHandler handler; + + if (!(handler = load_builtin_handler())) + { + pOut->reg_Flags |= 0x0001; + return FALSE; + } TRACE( "Control '%s': " "eax=0x%08x, ebx=0x%08x, ecx=0x%08x, " @@ -155,7 +177,7 @@ BOOL WINAPI VWIN32_DeviceIoControl(DWORD dwIoControlCode, break; } - CallBuiltinHandler( &cxt, intnum ); + handler( &cxt, intnum ); CONTEXT_2_DIOCRegs( &cxt, pOut ); } return TRUE; @@ -203,12 +225,19 @@ DWORD WINAPI VWIN32_VxDCall( DWORD service, CONTEXT86 *context ) { DWORD callnum = stack32_pop(context); DWORD parm = stack32_pop(context); + CallBuiltinHandler handler; TRACE("Int31/DPMI dispatch(%08x)\n", callnum); + if (!(handler = load_builtin_handler())) + { + context->EFlags |= 0x0001; + return 0; + } + context->Eax = callnum; context->Ecx = parm; - CallBuiltinHandler( context, 0x31 ); + handler( context, 0x31 ); return LOWORD(context->Eax); } case 0x002a: /* Int41 dispatch - parm = int41 service number */

1 0