May 2012 - Wine-commits - list.winehq.org

Alexandre Julliard : gdi32: Keep the source DC locked until the end in StretchBlt and AlphaBlend.
by Alexandre Julliard 31 May '12

31 May '12

Module: wine Branch: master Commit: 6d23f3e7e17b5f88c66a46b65cd31e55ee881b75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d23f3e7e17b5f88c66a46b65… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 30 22:55:30 2012 +0200 gdi32: Keep the source DC locked until the end in StretchBlt and AlphaBlend. --- dlls/gdi32/bitblt.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 8763218..238e375 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -256,9 +256,11 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, if (!(dc_src = get_dc_ptr( src_dev->hdc ))) return FALSE; src_dev = GET_DC_PHYSDEV( dc_src, pGetImage ); - err = src_dev->funcs->pGetImage( src_dev, src_info, &bits, src ); - release_dc_ptr( dc_src ); - if (err) return FALSE; + if (src_dev->funcs->pGetImage( src_dev, src_info, &bits, src )) + { + release_dc_ptr( dc_src ); + return FALSE; + } dst_dev = GET_DC_PHYSDEV( dc_dst, pPutImage ); copy_bitmapinfo( dst_info, src_info ); @@ -299,6 +301,7 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, } if (bits.free) bits.free( &bits ); + release_dc_ptr( dc_src ); return !err; } @@ -317,7 +320,6 @@ BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, if (!(dc_src = get_dc_ptr( src_dev->hdc ))) return FALSE; src_dev = GET_DC_PHYSDEV( dc_src, pGetImage ); err = src_dev->funcs->pGetImage( src_dev, src_info, &bits, src ); - release_dc_ptr( dc_src ); if (err) goto done; dst_dev = GET_DC_PHYSDEV( dc_dst, pBlendImage ); @@ -339,6 +341,7 @@ BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, if (bits.free) bits.free( &bits ); done: + release_dc_ptr( dc_src ); if (err) SetLastError( err ); return !err; }

1 0

Jacek Caban : dxgi.idl: Added IDXGIKeyedMutex declaration.
by Alexandre Julliard 31 May '12

31 May '12

Module: wine Branch: master Commit: bbf8c42f6915f1b392052070b12d4c45a60defdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbf8c42f6915f1b392052070b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 31 13:19:54 2012 +0200 dxgi.idl: Added IDXGIKeyedMutex declaration. --- include/dxgi.idl | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/dxgi.idl b/include/dxgi.idl index e74b525..d87a72c 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -192,6 +192,18 @@ interface IDXGIResource : IDXGIDeviceSubObject [ object, + uuid(9d8e1289-d7b3-465f-8126-250e349af85d), + local, + pointer_default(unique) +] +interface IDXGIKeyedMutex : IDXGIDeviceSubObject +{ + HRESULT AcquireSync([in] UINT64 Key, [in] DWORD dwMilliseconds); + HRESULT ReleaseSync([in] UINT64 Key); +} + +[ + object, local, uuid(cafcb56c-6ac3-4889-bf47-9e23bbd260ec) ]

1 0

Huw Davies : include: Add a couple of missing printer status values.
by Alexandre Julliard 31 May '12

31 May '12

Module: wine Branch: master Commit: e550cee7ccb7c4cf03203685b785d55e9f6f4c39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e550cee7ccb7c4cf03203685b… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 31 13:57:38 2012 +0100 include: Add a couple of missing printer status values. --- include/winspool.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/winspool.h b/include/winspool.h index f436bea..4648ec4 100644 --- a/include/winspool.h +++ b/include/winspool.h @@ -98,6 +98,8 @@ extern "C" { #define PRINTER_STATUS_DOOR_OPEN 0x00400000 #define PRINTER_STATUS_SERVER_UNKNOWN 0x00800000 #define PRINTER_STATUS_POWER_SAVE 0x01000000 +#define PRINTER_STATUS_SERVER_OFFLINE 0x02000000 +#define PRINTER_STATUS_DRIVER_UPDATE_NEEDED 0x04000000 #define NO_PRIORITY 0 #define MAX_PRIORITY 99

1 0

Huw Davies : winspool: Change get_dword_from_reg to accept a unicode value name.
by Alexandre Julliard 31 May '12

31 May '12

Module: wine Branch: master Commit: b97c5da2cf1a24099fa7f43798000ebf4c3d687b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b97c5da2cf1a24099fa7f4379… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 31 13:57:39 2012 +0100 winspool: Change get_dword_from_reg to accept a unicode value name. --- dlls/winspool.drv/info.c | 40 +++++++++++++++++++--------------------- 1 files changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index f12522b..481bad9 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -195,6 +195,7 @@ static const WCHAR Default_DevModeW[] = {'D','e','f','a','u','l','t',' ','D','e' static const WCHAR Default_PriorityW[] = {'D','e','f','a','u','l','t',' ','P','r','i','o','r','i','t','y',0}; static const WCHAR Dependent_FilesW[] = {'D','e','p','e','n','d','e','n','t',' ','F','i','l','e','s',0}; static const WCHAR DescriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; +static const WCHAR dnsTimeoutW[] = {'d','n','s','T','i','m','e','o','u','t',0}; static const WCHAR DriverW[] = {'D','r','i','v','e','r',0}; static const WCHAR HardwareIDW[] = {'H','a','r','d','w','a','r','e','I','D',0}; static const WCHAR Help_FileW[] = {'H','e','l','p',' ','F','i','l','e',0}; @@ -218,6 +219,7 @@ static const WCHAR Separator_FileW[] = {'S','e','p','a','r','a','t','o','r',' ', static const WCHAR Share_NameW[] = {'S','h','a','r','e',' ','N','a','m','e',0}; static const WCHAR StartTimeW[] = {'S','t','a','r','t','T','i','m','e',0}; static const WCHAR StatusW[] = {'S','t','a','t','u','s',0}; +static const WCHAR txTimeoutW[] = {'t','x','T','i','m','e','o','u','t',0}; static const WCHAR UntilTimeW[] = {'U','n','t','i','l','T','i','m','e',0}; static const WCHAR VersionW[] = {'V','e','r','s','i','o','n',0}; static WCHAR WinPrintW[] = {'W','i','n','P','r','i','n','t',0}; @@ -3358,29 +3360,28 @@ BOOL WINAPI ResetPrinterW(HANDLE hPrinter, LPPRINTER_DEFAULTSW pDefault) } /***************************************************************************** - * WINSPOOL_GetDWORDFromReg + * get_dword_from_reg * - * Return DWORD associated with ValueName from hkey. + * Return DWORD associated with name from hkey. */ -static DWORD WINSPOOL_GetDWORDFromReg(HKEY hkey, LPCSTR ValueName) +static DWORD get_dword_from_reg( HKEY hkey, const WCHAR *name ) { DWORD sz = sizeof(DWORD), type, value = 0; LONG ret; - ret = RegQueryValueExA(hkey, ValueName, 0, &type, (LPBYTE)&value, &sz); + ret = RegQueryValueExW( hkey, name, 0, &type, (LPBYTE)&value, &sz ); if(ret != ERROR_SUCCESS) { - WARN("Got ret = %d on name %s\n", ret, ValueName); - return 0; + WARN("Got ret = %d on name %s\n", ret, debugstr_w(name)); + return 0; } if(type != REG_DWORD) { ERR("Got type %d\n", type); - return 0; + return 0; } return value; } - /***************************************************************************** * get_filename_from_reg [internal] * @@ -3770,12 +3771,11 @@ static BOOL WINSPOOL_GetPrinter_2(HKEY hkeyPrinter, PRINTER_INFO_2W *pi2, *pcbNeeded += size; } if(pi2) { - pi2->Attributes = WINSPOOL_GetDWORDFromReg(hkeyPrinter, "Attributes"); - pi2->Priority = WINSPOOL_GetDWORDFromReg(hkeyPrinter, "Priority"); - pi2->DefaultPriority = WINSPOOL_GetDWORDFromReg(hkeyPrinter, - "Default Priority"); - pi2->StartTime = WINSPOOL_GetDWORDFromReg(hkeyPrinter, "StartTime"); - pi2->UntilTime = WINSPOOL_GetDWORDFromReg(hkeyPrinter, "UntilTime"); + pi2->Attributes = get_dword_from_reg( hkeyPrinter, AttributesW ); + pi2->Priority = get_dword_from_reg( hkeyPrinter, PriorityW ); + pi2->DefaultPriority = get_dword_from_reg( hkeyPrinter, Default_PriorityW ); + pi2->StartTime = get_dword_from_reg( hkeyPrinter, StartTimeW ); + pi2->UntilTime = get_dword_from_reg( hkeyPrinter, UntilTimeW ); } if(!space && pi2) /* zero out pi2 if we can't completely fill buf */ @@ -3808,7 +3808,7 @@ static BOOL WINSPOOL_GetPrinter_4(HKEY hkeyPrinter, PRINTER_INFO_4W *pi4, *pcbNeeded += size; } if(pi4) { - pi4->Attributes = WINSPOOL_GetDWORDFromReg(hkeyPrinter, "Attributes"); + pi4->Attributes = get_dword_from_reg( hkeyPrinter, AttributesW ); } if(!space && pi4) /* zero out pi4 if we can't completely fill buf */ @@ -3850,11 +3850,9 @@ static BOOL WINSPOOL_GetPrinter_5(HKEY hkeyPrinter, PRINTER_INFO_5W *pi5, *pcbNeeded += size; } if(pi5) { - pi5->Attributes = WINSPOOL_GetDWORDFromReg(hkeyPrinter, "Attributes"); - pi5->DeviceNotSelectedTimeout = WINSPOOL_GetDWORDFromReg(hkeyPrinter, - "dnsTimeout"); - pi5->TransmissionRetryTimeout = WINSPOOL_GetDWORDFromReg(hkeyPrinter, - "txTimeout"); + pi5->Attributes = get_dword_from_reg( hkeyPrinter, AttributesW ); + pi5->DeviceNotSelectedTimeout = get_dword_from_reg( hkeyPrinter, dnsTimeoutW ); + pi5->TransmissionRetryTimeout = get_dword_from_reg( hkeyPrinter, txTimeoutW ); } if(!space && pi5) /* zero out pi5 if we can't completely fill buf */ @@ -4021,7 +4019,7 @@ BOOL WINAPI GetPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, size = sizeof(PRINTER_INFO_6); if (size <= cbBuf) { /* FIXME: We do not update the status yet */ - pi6->dwStatus = WINSPOOL_GetDWORDFromReg(hkeyPrinter, "Status"); + pi6->dwStatus = get_dword_from_reg( hkeyPrinter, StatusW ); ret = TRUE; } else { ret = FALSE;

1 0

Henri Verbeet : wined3d: Update nouveau card info.
by Alexandre Julliard 31 May '12

31 May '12

Module: wine Branch: master Commit: 948065a52f2c205391c6665a8f81f417cdde00ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=948065a52f2c205391c6665a8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 31 16:46:46 2012 +0200 wined3d: Update nouveau card info. --- dlls/wined3d/directx.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f2542b9..f7e62a7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2054,10 +2054,17 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i } cards[] = { + /* Kepler */ + {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, + /* Fermi */ + {"NVCF", CARD_NVIDIA_GEFORCE_GTX550}, + {"NVCE", CARD_NVIDIA_GEFORCE_GTX560}, {"NVC8", CARD_NVIDIA_GEFORCE_GTX570}, {"NVC4", CARD_NVIDIA_GEFORCE_GTX460}, {"NVC3", CARD_NVIDIA_GEFORCE_GT440}, + {"NVC1", CARD_NVIDIA_GEFORCE_GT420}, {"NVC0", CARD_NVIDIA_GEFORCE_GTX480}, + /* Tesla */ {"NVAF", CARD_NVIDIA_GEFORCE_GT320M}, {"NVAC", CARD_NVIDIA_GEFORCE_8200}, {"NVAA", CARD_NVIDIA_GEFORCE_8200}, @@ -2071,10 +2078,11 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i {"NV92", CARD_NVIDIA_GEFORCE_9800GT}, {"NV86", CARD_NVIDIA_GEFORCE_8500GT}, {"NV84", CARD_NVIDIA_GEFORCE_8600GT}, + {"NV50", CARD_NVIDIA_GEFORCE_8800GTX}, + /* Curie */ {"NV68", CARD_NVIDIA_GEFORCE_6200}, /* 7050 */ {"NV67", CARD_NVIDIA_GEFORCE_6200}, /* 7000M */ {"NV63", CARD_NVIDIA_GEFORCE_6200}, /* 7100 */ - {"NV50", CARD_NVIDIA_GEFORCE_8800GTX}, {"NV4E", CARD_NVIDIA_GEFORCE_6200}, /* 6100 Go / 6150 Go */ {"NV4C", CARD_NVIDIA_GEFORCE_6200}, /* 6150SE */ {"NV4B", CARD_NVIDIA_GEFORCE_7600}, @@ -2088,15 +2096,18 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i {"NV42", CARD_NVIDIA_GEFORCE_6800}, {"NV41", CARD_NVIDIA_GEFORCE_6800}, {"NV40", CARD_NVIDIA_GEFORCE_6800}, + /* Rankine */ {"NV38", CARD_NVIDIA_GEFORCEFX_5800}, /* FX 5950 Ultra */ {"NV36", CARD_NVIDIA_GEFORCEFX_5800}, /* FX 5700/5750 */ {"NV35", CARD_NVIDIA_GEFORCEFX_5800}, /* FX 5900 */ {"NV34", CARD_NVIDIA_GEFORCEFX_5200}, {"NV31", CARD_NVIDIA_GEFORCEFX_5600}, {"NV30", CARD_NVIDIA_GEFORCEFX_5800}, + /* Kelvin */ {"nv28", CARD_NVIDIA_GEFORCE4_TI4200}, {"nv25", CARD_NVIDIA_GEFORCE4_TI4200}, {"nv20", CARD_NVIDIA_GEFORCE3}, + /* Celsius */ {"nv1F", CARD_NVIDIA_GEFORCE4_MX}, /* GF4 MX IGP */ {"nv1A", CARD_NVIDIA_GEFORCE2}, /* GF2 IGP */ {"nv18", CARD_NVIDIA_GEFORCE4_MX}, @@ -2105,6 +2116,7 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i {"nv15", CARD_NVIDIA_GEFORCE2}, {"nv11", CARD_NVIDIA_GEFORCE2_MX}, {"nv10", CARD_NVIDIA_GEFORCE}, + /* Fahrenheit */ {"nv05", CARD_NVIDIA_RIVA_TNT2}, {"nv04", CARD_NVIDIA_RIVA_TNT}, {"nv03", CARD_NVIDIA_RIVA_128}, @@ -2119,8 +2131,10 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i FIXME_(d3d_caps)("Unknown renderer %s.\n", debugstr_a(gl_renderer)); d3d_level = d3d_level_from_gl_info(gl_info); + if (d3d_level >= 10) + return CARD_NVIDIA_GEFORCE_8800GTX; if (d3d_level >= 9) - return CARD_NVIDIA_GEFORCEFX_5600; + return CARD_NVIDIA_GEFORCEFX_5800; if (d3d_level >= 8) return CARD_NVIDIA_GEFORCE3; if (d3d_level >= 7)

1 0

Henri Verbeet : ddraw/tests: Move test_coop_level_mode_set() to ddraw7.c.
by Alexandre Julliard 31 May '12

31 May '12

Module: wine Branch: master Commit: 5227dfa8ef9a1c9c19b35ef3b3f7e604b167d8be URL: http://source.winehq.org/git/wine.git/?a=commit;h=5227dfa8ef9a1c9c19b35ef3b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 31 16:46:47 2012 +0200 ddraw/tests: Move test_coop_level_mode_set() to ddraw7.c. --- dlls/ddraw/tests/d3d.c | 448 --------------------------------------------- dlls/ddraw/tests/ddraw7.c | 432 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 432 insertions(+), 448 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5227dfa8ef9a1c9c19b35…

1 0

Henri Verbeet : d3d9: Get rid of IDirect3DVertexBuffer9Impl.
by Alexandre Julliard 31 May '12

31 May '12

Module: wine Branch: master Commit: 503b16392b622fd2be43b1f7ec4fc4544e290702 URL: http://source.winehq.org/git/wine.git/?a=commit;h=503b16392b622fd2be43b1f7e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 31 16:46:49 2012 +0200 d3d9: Get rid of IDirect3DVertexBuffer9Impl. --- dlls/d3d9/buffer.c | 83 ++++++++++++++++++++++----------------------- dlls/d3d9/d3d9_private.h | 21 ++++-------- dlls/d3d9/device.c | 12 +++--- 3 files changed, 54 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=503b16392b622fd2be43b…

1 0

Henri Verbeet : d3d9: Get rid of IDirect3DIndexBuffer9Impl.
by Alexandre Julliard 31 May '12

31 May '12

Module: wine Branch: master Commit: 6341389fe4ec21d6a5b63f5b94641284b7e8521e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6341389fe4ec21d6a5b63f5b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 31 16:46:50 2012 +0200 d3d9: Get rid of IDirect3DIndexBuffer9Impl. --- dlls/d3d9/buffer.c | 86 ++++++++++++++++++++++----------------------- dlls/d3d9/d3d9_private.h | 21 ++++------- dlls/d3d9/device.c | 8 ++-- 3 files changed, 53 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6341389fe4ec21d6a5b63…

1 0

Alexandre Julliard : setupapi: Add support for a WinePreInstall section for registry keys that need to be created before anything else .
by Alexandre Julliard 31 May '12

31 May '12

Module: wine Branch: master Commit: 9a6a1126b9b8b4b5f17b16249eba761063be4be8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a6a1126b9b8b4b5f17b16249… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 30 20:25:37 2012 +0200 setupapi: Add support for a WinePreInstall section for registry keys that need to be created before anything else. --- dlls/setupapi/install.c | 10 ++++++++++ tools/wine.inf.in | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 96eb914..874b4a9 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -91,6 +91,7 @@ static const WCHAR Name[] = {'N','a','m','e',0}; static const WCHAR CmdLine[] = {'C','m','d','L','i','n','e',0}; static const WCHAR SubDir[] = {'S','u','b','D','i','r',0}; static const WCHAR WineFakeDlls[] = {'W','i','n','e','F','a','k','e','D','l','l','s',0}; +static const WCHAR WinePreInstall[] = {'W','i','n','e','P','r','e','I','n','s','t','a','l','l',0}; static const WCHAR DisplayName[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; static const WCHAR Description[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR ServiceBinary[] = {'S','e','r','v','i','c','e','B','i','n','a','r','y',0}; @@ -1067,6 +1068,15 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section, BOOL ret; int i; + if (flags & SPINST_REGISTRY) + { + struct registry_callback_info info; + + info.default_root = key_root; + info.delete = FALSE; + if (!iterate_section_fields( hinf, section, WinePreInstall, registry_callback, &info )) + return FALSE; + } if (flags & SPINST_FILES) { struct files_callback_info info; diff --git a/tools/wine.inf.in b/tools/wine.inf.in index f95d9dc..e8bf101 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -80,6 +80,7 @@ AddReg=\ [DefaultInstall.ntamd64] RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDlls +WinePreInstall=Wow64 UpdateInis=SystemIni CopyFiles=(a)l_intl.nls AddReg=\ @@ -102,8 +103,7 @@ AddReg=\ SessionMgr,\ Tapi,\ Timezones,\ - VersionInfo,\ - Wow64 + VersionInfo [Wow64Install] RegisterDlls=RegisterDllsSection

1 0

Vincent Povirk : mscoree: Install Wine Mono on prefix update.
by Alexandre Julliard 31 May '12

31 May '12

Module: wine Branch: master Commit: 1e721a487775a2f306512a7c719b5fa3301f433d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e721a487775a2f306512a7c7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 29 10:35:36 2012 -0500 mscoree: Install Wine Mono on prefix update. --- dlls/mscoree/mscoree_main.c | 120 +++++++++++++++++++++++++++++++++++++++++++ tools/wine.inf.in | 1 + 2 files changed, 121 insertions(+), 0 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 0aa736f..c7a50c1 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -617,8 +617,128 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) return hr; } +static void parse_msi_version_string(const char *version, int *parts) +{ + const char *minor_start, *build_start; + + parts[0] = atoi(version); + + parts[1] = parts[2] = 0; + + minor_start = strchr(version, '.'); + if (minor_start) + { + minor_start++; + parts[1] = atoi(minor_start); + + build_start = strchr(minor_start, '.'); + if (build_start) + parts[2] = atoi(build_start+1); + } +} + +static BOOL install_wine_mono(void) +{ + BOOL is_wow64=0; + HMODULE hmsi; + UINT (WINAPI *pMsiGetProductInfoA)(LPCSTR,LPCSTR,LPSTR,DWORD*); + char versionstringbuf[15]; + UINT res; + DWORD buffer_size; + PROCESS_INFORMATION pi; + STARTUPINFOW si; + WCHAR app[MAX_PATH]; + WCHAR *args; + LONG len; + BOOL ret; + + static const char* mono_version = "0.0.4"; + static const char* mono_product_code = "{E45D8920-A758-4088-B6C6-31DBB276992E}"; + + static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0}; + static const WCHAR argsW[] = + {' ','a','p','p','w','i','z','.','c','p','l',' ','i','n','s','t','a','l','l','_','m','o','n','o',0}; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + + if (is_wow64) + { + TRACE("not installing mono in wow64 process\n"); + return TRUE; + } + + hmsi = LoadLibraryA("msi"); + + if (!hmsi) + { + ERR("couldn't load msi.dll\n"); + return FALSE; + } + + pMsiGetProductInfoA = (void*)GetProcAddress(hmsi, "MsiGetProductInfoA"); + + buffer_size = sizeof(versionstringbuf); + + res = pMsiGetProductInfoA(mono_product_code, "VersionString", versionstringbuf, &buffer_size); + + FreeLibrary(hmsi); + + if (res == ERROR_SUCCESS) + { + int current_version[3], wanted_version[3], i; + + TRACE("found installed version %s\n", versionstringbuf); + + parse_msi_version_string(versionstringbuf, current_version); + parse_msi_version_string(mono_version, wanted_version); + + for (i=0; i<3; i++) + { + if (current_version[i] < wanted_version[i]) + break; + else if (current_version[i] > wanted_version[i]) + { + TRACE("installed version is newer than %s, quitting\n", mono_version); + return TRUE; + } + } + + if (i == 3) + { + TRACE("version %s is already installed, quitting\n", mono_version); + return TRUE; + } + } + + len = GetSystemDirectoryW(app, MAX_PATH-sizeof(controlW)/sizeof(WCHAR)); + memcpy(app+len, controlW, sizeof(controlW)); + + args = HeapAlloc(GetProcessHeap(), 0, (len*sizeof(WCHAR) + sizeof(controlW) + sizeof(argsW))); + if(!args) + return FALSE; + + memcpy(args, app, len*sizeof(WCHAR) + sizeof(controlW)); + memcpy(args + len + sizeof(controlW)/sizeof(WCHAR)-1, argsW, sizeof(argsW)); + + TRACE("starting %s\n", debugstr_w(args)); + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + ret = CreateProcessW(app, args, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + HeapFree(GetProcessHeap(), 0, args); + if (ret) { + CloseHandle(pi.hThread); + WaitForSingleObject(pi.hProcess, INFINITE); + CloseHandle(pi.hProcess); + } + + return ret; +} + HRESULT WINAPI DllRegisterServer(void) { + install_wine_mono(); + return __wine_register_resources( MSCOREE_hInstance ); } diff --git a/tools/wine.inf.in b/tools/wine.inf.in index e8bf101..d4b53cf 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2502,6 +2502,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,cryptdlg.dll,1 11,,cryptnet.dll,1 11,,devenum.dll,1 +11,,mscoree.dll,1 11,,mshtml.dll,1 11,,msisip.dll,1 11,,qcap.dll,1

1 0