August 2007 - Wine-commits - list.winehq.org

Maarten Lankhorst : dsound: Acceleration fixes for wavein emulation.
by Alexandre Julliard 06 Aug '07

06 Aug '07

Module: wine Branch: master Commit: c3ebd3652a76298c26037e8f79cb75c2f913c234 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3ebd3652a76298c26037e8f7… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Aug 4 11:11:17 2007 +0200 dsound: Acceleration fixes for wavein emulation. --- dlls/dsound/capture.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 34c36dd..2ee27ae 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -1494,8 +1494,6 @@ HRESULT IDirectSoundCaptureBufferImpl_Create( } } else { DWORD flags = CALLBACK_FUNCTION; - if (ds_hw_accel != DS_HW_ACCEL_EMULATION) - flags |= WAVE_DIRECTSOUND; err = mmErr(waveInOpen(&(device->hwi), device->drvdesc.dnDevNode, device->pwfx, (DWORD_PTR)DSOUND_capture_callback, (DWORD)device, flags)); @@ -1584,16 +1582,18 @@ HRESULT DirectSoundCaptureDevice_Initialize( *ppDevice = device; device->guid = devGUID; - err = mmErr(waveInMessage((HWAVEIN)wid,DRV_QUERYDSOUNDIFACE,(DWORD_PTR)&(device->driver),0)); - if ( (err != DS_OK) && (err != DSERR_UNSUPPORTED) ) { - WARN("waveInMessage failed; err=%x\n",err); - return err; + /* Disable the direct sound driver to force emulation if requested. */ + device->driver = NULL; + if (ds_hw_accel > DS_HW_ACCEL_EMULATION) + { + err = mmErr(waveInMessage((HWAVEIN)wid,DRV_QUERYDSOUNDIFACE,(DWORD_PTR)&(device->driver),0)); + if ( (err != DS_OK) && (err != DSERR_UNSUPPORTED) ) { + WARN("waveInMessage failed; err=%x\n",err); + return err; + } } err = DS_OK; - /* Disable the direct sound driver to force emulation if requested. */ - if (ds_hw_accel == DS_HW_ACCEL_EMULATION) - device->driver = NULL; /* Get driver description */ if (device->driver) {

1 0

Francois Gouget : netapi32: Add fixmes for the headers that are still missing and thus cannot be included in lm .h.
by Alexandre Julliard 06 Aug '07

06 Aug '07

Module: wine Branch: master Commit: 34b6a346f519d52569430fcfee8114878a82802a URL: http://source.winehq.org/git/wine.git/?a=commit;h=34b6a346f519d52569430fcfe… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Aug 4 03:22:27 2007 +0200 netapi32: Add fixmes for the headers that are still missing and thus cannot be included in lm.h. Also note that lmbrowsr.h is no longer present in current PSDKs. --- include/lm.h | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/include/lm.h b/include/lm.h index 429ca9f..86a2d5a 100644 --- a/include/lm.h +++ b/include/lm.h @@ -24,7 +24,6 @@ #include <lmcons.h> #include <lmerr.h> #include <lmshare.h> -#include <lmbrowsr.h> #include <lmaccess.h> #include <lmserver.h> #include <lmwksta.h> @@ -33,5 +32,15 @@ #include <lmjoin.h> #include <lmmsg.h> #include <lmuse.h> +/* FIXME: #include <lmalert.h> */ +/* FIXME: #include <lmremutl.h> */ +/* FIXME: #include <lmrepl.h> */ +/* FIXME: #include <lmsvc.h> */ +/* FIXME: #include <lmerrlog.h> */ +/* FIXME: #include <lmconfig.h> */ +/* FIXME: #include <lmaudit.h> */ + +/* The following are obsolete headers */ +#include <lmbrowsr.h> #endif

1 0

Francois Gouget : netapi32: Add lmuseflg.h and include it from lmuse.h.
by Alexandre Julliard 06 Aug '07

06 Aug '07

Module: wine Branch: master Commit: a4bbc858530e56ade6574aa17fd994de1e282fbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4bbc858530e56ade6574aa17… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Aug 4 03:20:00 2007 +0200 netapi32: Add lmuseflg.h and include it from lmuse.h. Also add some prototypes to lmuse.h, and use it in the implementation. --- dlls/netapi32/access.c | 1 + include/Makefile.in | 1 + include/lmuse.h | 38 +++++++++++++++++++++++++++++--------- include/lmuseflg.h | 26 ++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 9 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 70adc97..40b448d 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -29,6 +29,7 @@ #include "lmaccess.h" #include "lmapibuf.h" #include "lmerr.h" +#include "lmuse.h" #include "ntsecapi.h" #include "wine/debug.h" #include "wine/unicode.h" diff --git a/include/Makefile.in b/include/Makefile.in index 4d71204..f3702d5 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -207,6 +207,7 @@ SRCDIR_INCLUDES = \ lmshare.h \ lmstats.h \ lmuse.h \ + lmuseflg.h \ lmwksta.h \ lzexpand.h \ mapi.h \ diff --git a/include/lmuse.h b/include/lmuse.h index 786fb01..043cfac 100644 --- a/include/lmuse.h +++ b/include/lmuse.h @@ -22,20 +22,40 @@ extern "C" { #endif -typedef struct _USE_INFO_1 { - LMSTR ui1_local, ui1_remote, ui1_password; - DWORD ui1_status, ui1_asg_type, ui1_refcount, ui1_usecount; +#include "lmcons.h" +#include "lmuseflg.h" + +typedef struct _USE_INFO_1 +{ + LMSTR ui1_local; + LMSTR ui1_remote; + LMSTR ui1_password; + DWORD ui1_status; + DWORD ui1_asg_type; + DWORD ui1_refcount; + DWORD ui1_usecount; } USE_INFO_1, *PUSE_INFO_1, *LPUSE_INFO_1; -typedef struct _USE_INFO_2 { - LMSTR ui2_local, ui2_remote, ui2_password; - DWORD ui2_status, ui2_asg_type, ui2_refcount, ui2_usecount; - LPWSTR ui2_username; - LMSTR ui2_domainname; +typedef struct _USE_INFO_2 +{ + LMSTR ui2_local; + LMSTR ui2_remote; + LMSTR ui2_password; + DWORD ui2_status; + DWORD ui2_asg_type; + DWORD ui2_refcount; + DWORD ui2_usecount; + LMSTR ui2_username; + LMSTR ui2_domainname; } USE_INFO_2, *PUSE_INFO_2, *LPUSE_INFO_2; +NET_API_STATUS WINAPI NetUseAdd(LMSTR,DWORD,LPBYTE,LPDWORD); +NET_API_STATUS WINAPI NetUseDel(LMSTR,LMSTR,DWORD); +NET_API_STATUS WINAPI NetUseEnum(LMSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD); +NET_API_STATUS WINAPI NetUseGetInfo(LMSTR,LMSTR,DWORD,LPBYTE*); + #ifdef __cplusplus } #endif -#endif /* ndef _LMUSE_H */ +#endif /* _LMUSE_H */ diff --git a/include/lmuseflg.h b/include/lmuseflg.h new file mode 100644 index 0000000..cf00317 --- /dev/null +++ b/include/lmuseflg.h @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2007 Francois Gouget + * + * 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 + */ + +#ifndef __WINE_LMUSEFLG_H +#define __WINE_LMUSEFLG_H + +#define USE_NOFORCE 0 +#define USE_FORCE 1 +#define USE_LOTS_OF_FORCE 2 + +#endif /* __WINE_LMUSEFLG_H */

1 0

Francois Gouget : mapi32: Add a prototype for MAPIAdminProfiles.
by Alexandre Julliard 06 Aug '07

06 Aug '07

Module: wine Branch: master Commit: 0c019a5e778e951bfbb8426ed40f785b5d13162b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c019a5e778e951bfbb8426ed… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Aug 4 03:23:23 2007 +0200 mapi32: Add a prototype for MAPIAdminProfiles. --- include/mapix.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/mapix.h b/include/mapix.h index 31da133..e511cdf 100644 --- a/include/mapix.h +++ b/include/mapix.h @@ -114,6 +114,10 @@ typedef MAPIFREEBUFFER *LPMAPIFREEBUFFER; MAPIFREEBUFFER MAPIFreeBuffer; #endif +typedef HRESULT (WINAPI MAPIADMINPROFILES)(ULONG,LPPROFADMIN*); +typedef MAPIADMINPROFILES *LPMAPIADMINPROFILES; +MAPIADMINPROFILES MAPIAdminProfiles; + /***************************************************************************** * IMAPISession interface */

1 0

Nigel Liang : winecfg: Fix crash caused by calling set_reg_key with NULL value.
by Alexandre Julliard 06 Aug '07

06 Aug '07

Module: wine Branch: master Commit: 4536a9d66d11c46028952de5b44ccf52da43a1b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4536a9d66d11c46028952de5b… Author: Nigel Liang <ncliang(a)gmail.com> Date: Fri Aug 3 18:34:57 2007 -0700 winecfg: Fix crash caused by calling set_reg_key with NULL value. --- programs/winecfg/winecfg.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index 84dd4c8..1a19888 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -464,15 +464,19 @@ static void set_reg_key_ex(HKEY root, const WCHAR *path, const WCHAR *name, cons void set_reg_key(HKEY root, const char *path, const char *name, const char *value) { - WCHAR *wpath, *wname, *wvalue; + WCHAR *wpath, *wname, *wvalue = NULL; wpath = HeapAlloc(GetProcessHeap(), 0, (strlen(path)+1)*sizeof(WCHAR)); wname = HeapAlloc(GetProcessHeap(), 0, (strlen(name)+1)*sizeof(WCHAR)); - wvalue = HeapAlloc(GetProcessHeap(), 0, (strlen(value)+1)*sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, path, -1, wpath, strlen(path)+1); MultiByteToWideChar(CP_ACP, 0, name, -1, wname, strlen(name)+1); - MultiByteToWideChar(CP_ACP, 0, value, -1, wvalue, strlen(value)+1); + + if (value) + { + wvalue = HeapAlloc(GetProcessHeap(), 0, (strlen(value)+1)*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, value, -1, wvalue, strlen(value)+1); + } set_reg_key_ex(root, wpath, wname, wvalue, REG_SZ);

1 0

Maarten Lankhorst : dsound: Sound acceleration fixes.
by Alexandre Julliard 06 Aug '07

06 Aug '07

Module: wine Branch: master Commit: 3f762d5d0bfcc4b8c758e885972d4dffaa105884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f762d5d0bfcc4b8c758e8859… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Aug 3 22:15:50 2007 +0200 dsound: Sound acceleration fixes. --- dlls/dsound/dsound.c | 10 ++++------ dlls/dsound/primary.c | 6 ++---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 9680930..d154119 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1411,13 +1411,11 @@ HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcG *ppDevice = device; device->guid = devGUID; + device->driver = NULL; /* DRV_QUERYDSOUNDIFACE is a "Wine extension" to get the DSound interface */ - waveOutMessage((HWAVEOUT)wod, DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&device->driver, 0); - - /* Disable the direct sound driver to force emulation if requested. */ - if (ds_hw_accel == DS_HW_ACCEL_EMULATION) - device->driver = NULL; + if (ds_hw_accel > DS_HW_ACCEL_EMULATION) + waveOutMessage((HWAVEOUT)wod, DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&device->driver, 0); /* Get driver description */ if (device->driver) { @@ -1441,7 +1439,7 @@ HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcG DWORD flags = CALLBACK_FUNCTION; /* disable direct sound if requested */ - if (ds_hw_accel != DS_HW_ACCEL_EMULATION) + if (device->driver) flags |= WAVE_DIRECTSOUND; hr = mmErr(waveOutOpen(&(device->hwo), diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 355fc2c..3e75275 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -290,9 +290,7 @@ HRESULT DSOUND_PrimaryStop(DirectSoundDevice *device) if (device->hwbuf) { err = IDsDriverBuffer_Stop(device->hwbuf); if (err == DSERR_BUFFERLOST) { - DWORD flags = CALLBACK_FUNCTION; - if (ds_hw_accel != DS_HW_ACCEL_EMULATION) - flags |= WAVE_DIRECTSOUND; + DWORD flags = CALLBACK_FUNCTION | WAVE_DIRECTSOUND; /* Wine-only: the driver wants us to reopen the device */ /* FIXME: check for errors */ IDsDriverBuffer_Release(device->hwbuf); @@ -415,7 +413,7 @@ HRESULT DSOUND_PrimarySetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX wfex) if (device->drvdesc.dwFlags & DSDDESC_DOMMSYSTEMSETFORMAT) { DWORD flags = CALLBACK_FUNCTION; - if (ds_hw_accel != DS_HW_ACCEL_EMULATION) + if (device->driver) flags |= WAVE_DIRECTSOUND; /* FIXME: check for errors */ DSOUND_PrimaryClose(device);

1 0

Maarten Lankhorst : dsound: Make timer more robust.
by Alexandre Julliard 06 Aug '07

06 Aug '07

Module: wine Branch: master Commit: abe8c127d9789a99274ea1a5e83e650f3e8fed26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abe8c127d9789a99274ea1a5e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Aug 4 10:41:59 2007 +0200 dsound: Make timer more robust. --- dlls/dsound/dsound.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index d154119..cc693cb 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1514,10 +1514,26 @@ HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcG hr = DSOUND_PrimaryCreate(device); if (hr == DS_OK) { + UINT triggertime = DS_TIME_DEL, res = DS_TIME_RES, id; + TIMECAPS time; + DSOUND_renderer[device->drvdesc.dnDevNode] = device; - timeBeginPeriod(DS_TIME_RES); - DSOUND_renderer[device->drvdesc.dnDevNode]->timerID = timeSetEvent(DS_TIME_DEL, DS_TIME_RES, DSOUND_timer, - (DWORD_PTR)DSOUND_renderer[device->drvdesc.dnDevNode], TIME_PERIODIC | TIME_CALLBACK_FUNCTION | TIME_KILL_SYNCHRONOUS); + timeGetDevCaps(&time, sizeof(TIMECAPS)); + TRACE("Minimum timer resolution: %u, max timer: %u\n", time.wPeriodMin, time.wPeriodMax); + if (triggertime < time.wPeriodMin) + triggertime = time.wPeriodMin; + if (res < time.wPeriodMin) + res = time.wPeriodMin; + if (timeBeginPeriod(res) == TIMERR_NOCANDO) + WARN("Could not set minimum resolution, don't expect sound\n"); + id = timeSetEvent(triggertime, res, DSOUND_timer, (DWORD_PTR)device, TIME_PERIODIC | TIME_KILL_SYNCHRONOUS); + if (!id) + { + WARN("Timer not created! Retrying without TIME_KILL_SYNCHRONOUS\n"); + id = timeSetEvent(triggertime, res, DSOUND_timer, (DWORD_PTR)device, TIME_PERIODIC); + if (!id) ERR("Could not create timer, sound playback will not occur\n"); + } + DSOUND_renderer[device->drvdesc.dnDevNode]->timerID = id; } else { WARN("DSOUND_PrimaryCreate failed\n"); }

1 0

Francois Gouget : dwmapi: Add dwmapi.h and update win32. api to fix the winapi_check warnings.
by Alexandre Julliard 06 Aug '07

06 Aug '07

Module: wine Branch: master Commit: 5e565a76b4f9bddb0fa594f2c7e4a56dfb087dd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e565a76b4f9bddb0fa594f2c… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Aug 4 03:21:06 2007 +0200 dwmapi: Add dwmapi.h and update win32.api to fix the winapi_check warnings. --- dlls/dwmapi/dwmapi_main.c | 1 + include/Makefile.in | 1 + include/dwmapi.h | 39 +++++++++++++++++++++++++++++++++++++++ tools/winapi/win32.api | 10 ++++++++++ 4 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index e4ebc3c..009f194 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -29,6 +29,7 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "dwmapi.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dwmapi); diff --git a/include/Makefile.in b/include/Makefile.in index 07daf60..889cd9c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -152,6 +152,7 @@ SRCDIR_INCLUDES = \ dshow.h \ dsound.h \ dsrole.h \ + dwmapi.h \ dxdiag.h \ dxerr8.h \ dxerr9.h \ diff --git a/include/dwmapi.h b/include/dwmapi.h new file mode 100644 index 0000000..b2a28b6 --- /dev/null +++ b/include/dwmapi.h @@ -0,0 +1,39 @@ +/* + * 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 + */ + +#ifndef __WINE_DWMAPI_H +#define __WINE_DWMAPI_H + +#include "wtypes.h" +#include "uxtheme.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef DWMAPI +# define DWMAPI STDAPI +# define DWMAPI_(type) STDAPI_(type) +#endif + +DWMAPI DwmEnableComposition(UINT); +DWMAPI DwmIsCompositionEnabled(BOOL*); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_DWMAPI_H */ diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index c1e4003..1a7278c 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -1306,6 +1306,16 @@ LPVOID * REFCLSID REFIID +%%dwmapi.dll + +%long + +HRESULT + +%ptr + +BOOL * + %%dxdiagn.dll %ptr

1 0

Francois Gouget : imagehlp: Better match the PSDK types, especially with regards to constness.
by Alexandre Julliard 06 Aug '07

06 Aug '07

Module: wine Branch: master Commit: b86570d136f97481537ec8b17335a5a1c94ade90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b86570d136f97481537ec8b17… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Aug 4 03:15:44 2007 +0200 imagehlp: Better match the PSDK types, especially with regards to constness. Add many missing prototypes which we already had in dbghelp.h, and their related structures. Update win32.api to fix the winapi_check warnings. --- dlls/imagehlp/access.c | 4 +- dlls/imagehlp/modify.c | 26 +- include/imagehlp.h | 720 +++++++++++++++++++++++++++++++++++++++++++++--- tools/winapi/win32.api | 13 +- 4 files changed, 698 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b86570d136f97481537ec…

1 0

Francois Gouget : mscoree: Add cor.h and mscoree. idl and fix some semi-stub prototypes.
by Alexandre Julliard 06 Aug '07

06 Aug '07

Module: wine Branch: master Commit: 402b8f0d59d5c210050b36c0f280a5e2a78d02c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=402b8f0d59d5c210050b36c0f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Aug 4 03:16:33 2007 +0200 mscoree: Add cor.h and mscoree.idl and fix some semi-stub prototypes. --- .gitignore | 1 + dlls/mscoree/mscoree_main.c | 11 +++++++---- include/Makefile.in | 2 ++ include/cor.h | 43 +++++++++++++++++++++++++++++++++++++++++++ include/mscoree.idl | 27 +++++++++++++++++++++++++++ 5 files changed, 80 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2fdb222..94a13c9 100644 --- a/.gitignore +++ b/.gitignore @@ -725,6 +725,7 @@ include/mediaobj.h include/mimeinfo.h include/mlang.h include/mmstream.h +include/mscoree.h include/mshtmhst.h include/mshtml.h include/msinkaut.h diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index fd2c0a9..678b346 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -27,6 +27,9 @@ #include "winreg.h" #include "ole2.h" +#include "cor.h" +#include "mscoree.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); @@ -123,7 +126,7 @@ static LPWSTR get_mono_exe(void) return ret; } -int WINAPI _CorExeMain(void) +__int32 WINAPI _CorExeMain(void) { STARTUPINFOW si; PROCESS_INFORMATION pi; @@ -168,7 +171,7 @@ int WINAPI _CorExeMain(void) return (int)exit_code; } -int WINAPI _CorExeMain2(PBYTE ptrMemory, DWORD cntMemory, LPCWSTR imageName, LPCWSTR loaderName, LPCWSTR cmdLine) +__int32 WINAPI _CorExeMain2(PBYTE ptrMemory, DWORD cntMemory, LPWSTR imageName, LPWSTR loaderName, LPWSTR cmdLine) { TRACE("(%p, %u, %s, %s, %s)\n", ptrMemory, cntMemory, debugstr_w(imageName), debugstr_w(loaderName), debugstr_w(cmdLine)); FIXME("Directly running .NET applications not supported.\n"); @@ -181,12 +184,12 @@ void WINAPI CorExitProcess(int exitCode) ExitProcess(exitCode); } -void WINAPI _CorImageUnloading(LPCVOID* imageBase) +VOID WINAPI _CorImageUnloading(PVOID imageBase) { TRACE("(%p): stub\n", imageBase); } -DWORD WINAPI _CorValidateImage(LPCVOID* imageBase, LPCWSTR imageName) +HRESULT WINAPI _CorValidateImage(PVOID* imageBase, LPCWSTR imageName) { TRACE("(%p, %s): stub\n", imageBase, debugstr_w(imageName)); return E_FAIL; diff --git a/include/Makefile.in b/include/Makefile.in index 889cd9c..4d71204 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -28,6 +28,7 @@ IDL_H_SRCS = \ mimeinfo.idl \ mlang.idl \ mmstream.idl \ + mscoree.idl \ mshtmhst.idl \ mshtml.idl \ msinkaut.idl \ @@ -85,6 +86,7 @@ SRCDIR_INCLUDES = \ commctrl.h \ commdlg.h \ compobj.h \ + cor.h \ cpl.h \ custcntl.h \ cvconst.h \ diff --git a/include/cor.h b/include/cor.h new file mode 100644 index 0000000..cdf89dd --- /dev/null +++ b/include/cor.h @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2007 Francois Gouget + * + * 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 + */ + +#ifndef __WINE_COR_H +#define __WINE_COR_H + +#include "ole2.h" +/* FIXME: #include "specstrings.h" */ +/* FIXME: #include "corerror.h" */ +/* FIXME: #include "corhdr.h" */ + +#ifdef __cplusplus +extern "C" { +#endif + +BOOL WINAPI _CorDllMain(HINSTANCE,DWORD,LPVOID); +__int32 WINAPI _CorExeMain(void); +__int32 WINAPI _CorExeMain2(PBYTE,DWORD,LPWSTR,LPWSTR,LPWSTR); +VOID WINAPI _CorImageUnloading(PVOID); +HRESULT WINAPI _CorValidateImage(PVOID*,LPCWSTR); +HRESULT WINAPI CoInitializeCor(DWORD); +void WINAPI CoUninitializeCor(void); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_COR_H */ diff --git a/include/mscoree.idl b/include/mscoree.idl new file mode 100644 index 0000000..8dfaa1b --- /dev/null +++ b/include/mscoree.idl @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2007 Francois Gouget + * + * 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 + */ + +cpp_quote("/* FIXME: #include <gcghost.h> */") +cpp_quote("/* FIXME: #include <ivalidator.h> */") + +cpp_quote("HRESULT WINAPI CorBindToRuntimeHost(LPCWSTR,LPCWSTR,LPCWSTR,VOID*,DWORD,REFCLSID,REFIID,LPVOID*);") +cpp_quote("void WINAPI CorExitProcess(int);") +cpp_quote("HRESULT WINAPI GetCORSystemDirectory(LPWSTR,DWORD,DWORD*);") +cpp_quote("HRESULT WINAPI GetCORVersion(LPWSTR,DWORD,DWORD*);") +cpp_quote("HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,DWORD,LPWSTR,DWORD,DWORD*,LPWSTR,DWORD,DWORD*);") +cpp_quote("HRESULT WINAPI LoadLibraryShim(LPCWSTR,LPCWSTR,LPVOID,HMODULE*);")

1 0