wine-commits May 2012

wine-commits@winehq.org

2 participants
737 discussions

Oleksij Rempel : krnl386.exe: Fix drive spec in get_media_id call.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: fa3038c6bda292f156d98316d65f5b03433f7b22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa3038c6bda292f156d98316d… Author: Oleksij Rempel <bug-track(a)fisher-privat.net> Date: Tue May 29 23:10:08 2012 +0200 krnl386.exe: Fix drive spec in get_media_id call. --- dlls/krnl386.exe16/int21.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c index f25194b..3652054 100644 --- a/dlls/krnl386.exe16/int21.c +++ b/dlls/krnl386.exe16/int21.c @@ -2609,8 +2609,9 @@ static void INT21_Ioctl_Block( CONTEXT *context ) { WCHAR label[12],fsname[9]; DWORD serial; + TRACE( "GENERIC IOCTL - Get media id - %c:\n", + 'A' + drive ); - drivespec[0] += drive; GetVolumeInformationW(drivespec, label, 12, &serial, NULL, NULL, fsname, 9); *(WORD*)dataptr = 0; memcpy(dataptr+2,&serial,4);

1 0

Oleksij Rempel : shell32: Return empty list instead of NULL.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: 83196d0cb3dedd00254d13e3be9a8be7f2f8eb1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=83196d0cb3dedd00254d13e3b… Author: Oleksij Rempel <bug-track(a)fisher-privat.net> Date: Tue May 29 23:10:07 2012 +0200 shell32: Return empty list instead of NULL. --- dlls/shell32/dde.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 2e04bd7..144470b 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -82,6 +82,14 @@ static inline HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, FIXME( "returning fake program groups list\n" ); return DdeCreateDataHandle( dwDDEInst, groups_data, sizeof(groups_data), 0, hszGroups, uFmt, 0 ); } + else if (hszTopic == hszProgmanTopic && hszItem == hszProgmanService && uFmt == CF_TEXT) + { + static BYTE groups_data[] = "\r\n"; + FIXME( "returning empty groups list\n" ); + /* this is an workaround for an app wich expect some data + * and cant handle NULL. */ + return DdeCreateDataHandle( dwDDEInst, groups_data, sizeof(groups_data), 0, hszProgmanService, uFmt, 0 ); + } FIXME( "%u %p %s %s: stub\n", uFmt, hconv, debugstr_hsz(hszTopic), debugstr_hsz(hszItem) ); return NULL; }

1 0

Alexandre Julliard : appwiz.cpl: Specify a default download URL for add-ons .
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: d8b6b01bca3c5bb017518781dd595abb86aa5135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8b6b01bca3c5bb017518781d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 30 13:22:46 2012 +0200 appwiz.cpl: Specify a default download URL for add-ons. --- dlls/appwiz.cpl/addons.c | 53 ++++++++++++++++++++++++++-------------------- dlls/mshtml/mshtml.inf | 6 +---- tools/wine.inf.in | 2 - 3 files changed, 31 insertions(+), 30 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 4a5acba..fd48487 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -72,6 +72,7 @@ typedef struct { const char *file_name; const char *subdir_name; const char *sha; + const char *url_default; const char *config_key; const char *url_config_key; const char *dir_config_key; @@ -84,6 +85,7 @@ static const addon_info_t addons_info[] = { "wine_gecko-" GECKO_VERSION "-" ARCH_STRING ".msi", "gecko", GECKO_SHA, + "http://source.winehq.org/winegecko.php", "MSHTML", "GeckoUrl", "GeckoCabDir", MAKEINTRESOURCEW(ID_DWL_GECKO_DIALOG) }, @@ -92,6 +94,7 @@ static const addon_info_t addons_info[] = { "wine-mono-" MONO_VERSION ".msi", "mono", MONO_SHA, + "http://source.winehq.org/winemono.php", "Dotnet", "MonoUrl", "MonoCabDir", MAKEINTRESOURCEW(ID_DWL_MONO_DIALOG) } @@ -425,6 +428,22 @@ static const IBindStatusCallbackVtbl InstallCallbackVtbl = { static IBindStatusCallback InstallCallback = { &InstallCallbackVtbl }; +static void append_url_params( WCHAR *url ) +{ + static const WCHAR arch_formatW[] = {'?','a','r','c','h','='}; + static const WCHAR v_formatW[] = {'&','v','='}; + DWORD size = INTERNET_MAX_URL_LENGTH * sizeof(WCHAR); + DWORD len = strlenW(url); + + memcpy(url+len, arch_formatW, sizeof(arch_formatW)); + len += sizeof(arch_formatW)/sizeof(WCHAR); + len += MultiByteToWideChar(CP_ACP, 0, ARCH_STRING, sizeof(ARCH_STRING), + url+len, size/sizeof(WCHAR)-len)-1; + memcpy(url+len, v_formatW, sizeof(v_formatW)); + len += sizeof(v_formatW)/sizeof(WCHAR); + MultiByteToWideChar(CP_ACP, 0, addon->version, -1, url+len, size/sizeof(WCHAR)-len); +} + static LPWSTR get_url(void) { DWORD size = INTERNET_MAX_URL_LENGTH*sizeof(WCHAR); @@ -434,36 +453,24 @@ static LPWSTR get_url(void) DWORD returned_size; static const WCHAR httpW[] = {'h','t','t','p'}; - static const WCHAR arch_formatW[] = {'?','a','r','c','h','='}; - static const WCHAR v_formatW[] = {'&','v','='}; - - hkey = open_config_key(); - if(!hkey) - return NULL; url = heap_alloc(size); returned_size = size; - config_key = heap_strdupAtoW(addon->url_config_key); - res = RegQueryValueExW(hkey, config_key, NULL, &type, (LPBYTE)url, &returned_size); - heap_free(config_key); - RegCloseKey(hkey); - if(res != ERROR_SUCCESS || type != REG_SZ) { - heap_free(url); - return NULL; + hkey = open_config_key(); + if (hkey) + { + config_key = heap_strdupAtoW(addon->url_config_key); + res = RegQueryValueExW(hkey, config_key, NULL, &type, (LPBYTE)url, &returned_size); + heap_free(config_key); + RegCloseKey(hkey); + if(res == ERROR_SUCCESS && type == REG_SZ) goto found; } - if(returned_size > sizeof(httpW) && !memcmp(url, httpW, sizeof(httpW))) { - DWORD len; + MultiByteToWideChar( CP_ACP, 0, addon->url_default, -1, url, size / sizeof(WCHAR) ); - len = strlenW(url); - memcpy(url+len, arch_formatW, sizeof(arch_formatW)); - len += sizeof(arch_formatW)/sizeof(WCHAR); - len += MultiByteToWideChar(CP_ACP, 0, ARCH_STRING, sizeof(ARCH_STRING), url+len, size/sizeof(WCHAR)-len)-1; - memcpy(url+len, v_formatW, sizeof(v_formatW)); - len += sizeof(v_formatW)/sizeof(WCHAR); - MultiByteToWideChar(CP_ACP, 0, addon->version, -1, url+len, size/sizeof(WCHAR)-len); - } +found: + if (returned_size > sizeof(httpW) && !memcmp(url, httpW, sizeof(httpW))) append_url_params( url ); TRACE("Got URL %s\n", debugstr_w(url)); return url; diff --git a/dlls/mshtml/mshtml.inf b/dlls/mshtml/mshtml.inf index 8186c2d..4a650b4 100644 --- a/dlls/mshtml/mshtml.inf +++ b/dlls/mshtml/mshtml.inf @@ -3,7 +3,7 @@ Signature="$CHICAGO$" [RegisterDll] -AddReg=Classes.Reg, Protocols.Reg, IE.Reg, FileAssoc.Reg, WineGecko.Reg +AddReg=Classes.Reg, Protocols.Reg, IE.Reg, FileAssoc.Reg [UnregisterDll] @@ -69,10 +69,6 @@ HKLM,"Software\Microsoft\Internet Explorer\Default Behaviors","TIME",, "CLSID:47 HKLM,"Software\Microsoft\Internet Explorer\ActiveX Compatibility","Version",,"6.17" -[WineGecko.Reg] -HKCU,Software\Wine\MSHTML,"GeckoUrl",,"http://source.winehq.org/winegecko.php" - - [FileAssoc.Reg] ;; AVI diff --git a/tools/wine.inf.in b/tools/wine.inf.in index b182953..f95d9dc 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -712,8 +712,6 @@ HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-99 HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"Locale",2,"*" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"Version",2,"4,74,9273,0" -HKCU,SOFTWARE\Wine\Dotnet,"MonoUrl",,"http://source.winehq.org/winemono.php" - [Nls] HKLM,System\CurrentControlSet\Control\Nls\Codepage,"37",,"" HKLM,System\CurrentControlSet\Control\Nls\Language,"0401",,""

1 0

Lucas Zawacki : dinput/tests: Added a test for DIPROP_JOYSTICKID.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: e3d243861c3bced6fd7e8e68696cc4b11be3f5db URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3d243861c3bced6fd7e8e686… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue May 29 13:42:28 2012 -0300 dinput/tests: Added a test for DIPROP_JOYSTICKID. --- dlls/dinput/tests/joystick.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index c2f63c2..a49ee2e 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -180,6 +180,7 @@ static BOOL CALLBACK EnumJoysticks( ULONG ref; DIDEVICEINSTANCE inst; DIDEVICEINSTANCE_DX3 inst3; + DIPROPDWORD dipw; HWND hWnd = get_hwnd(); char oldstate[248], curstate[248]; @@ -205,6 +206,16 @@ static BOOL CALLBACK EnumJoysticks( trace("---- %s ----\n", lpddi->tszProductName); + /* Test for joystick ID property */ + ZeroMemory(&dipw, sizeof(dipw)); + dipw.diph.dwSize = sizeof(DIPROPDWORD); + dipw.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dipw.diph.dwObj = 0; + dipw.diph.dwHow = DIPH_DEVICE; + + hr = IDirectInputDevice_GetProperty(pJoystick, DIPROP_JOYSTICKID, &dipw.diph); + ok(SUCCEEDED(hr), "IDirectInputDevice_GetProperty() for DIPROP_JOYSTICKID failed\n"); + hr = IDirectInputDevice_SetDataFormat(pJoystick, NULL); ok(hr==E_POINTER,"IDirectInputDevice_SetDataFormat() should have returned " "E_POINTER, returned: %08x\n", hr);

1 0

Lucas Zawacki : dinput: Implement GetProperty for JOYSTICKID ( LinuxInput driver).
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: 2cd3b908ad97696ff4abdbb39636c992f8f04554 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cd3b908ad97696ff4abdbb39… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue May 29 13:42:27 2012 -0300 dinput: Implement GetProperty for JOYSTICKID (LinuxInput driver). --- dlls/dinput/joystick_linuxinput.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 2902f9f..3cab015 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -965,6 +965,15 @@ static HRESULT WINAPI JoystickWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REF break; } + case (DWORD_PTR) DIPROP_JOYSTICKID: + { + LPDIPROPDWORD pd = (LPDIPROPDWORD)pdiph; + + pd->dwData = get_joystick_index(&This->generic.base.guid); + TRACE("DIPROP_JOYSTICKID(%d)\n", pd->dwData); + break; + } + default: return JoystickWGenericImpl_GetProperty(iface, rguid, pdiph); }

1 0

Lucas Zawacki : dinput: Implement GetProperty for JOYSTICKID (Linux driver) .
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: fbfdc6db650b6d1038dd193375b1880a95c0d535 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbfdc6db650b6d1038dd19337… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue May 29 13:42:26 2012 -0300 dinput: Implement GetProperty for JOYSTICKID (Linux driver). --- dlls/dinput/joystick_linux.c | 40 ++++++++++++++++++++++++++++++++++++++-- include/dinput.h | 1 + 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index d951e76..5afd07c 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -542,6 +542,42 @@ static HRESULT WINAPI JoystickLinuxAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) } /****************************************************************************** + * GetProperty : get input device properties + */ +static HRESULT WINAPI JoystickLinuxWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REFGUID rguid, LPDIPROPHEADER pdiph) +{ + JoystickImpl *This = impl_from_IDirectInputDevice8W(iface); + + TRACE("(this=%p,%s,%p)\n", iface, debugstr_guid(rguid), pdiph); + _dump_DIPROPHEADER(pdiph); + + if (!IS_DIPROP(rguid)) return DI_OK; + + switch (LOWORD(rguid)) { + + case (DWORD_PTR) DIPROP_JOYSTICKID: + { + LPDIPROPDWORD pd = (LPDIPROPDWORD)pdiph; + + pd->dwData = get_joystick_index(&This->generic.base.guid); + TRACE("DIPROP_JOYSTICKID(%d)\n", pd->dwData); + break; + } + + default: + return JoystickWGenericImpl_GetProperty(iface, rguid, pdiph); + } + + return DI_OK; +} + +static HRESULT WINAPI JoystickLinuxAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPDIPROPHEADER pdiph) +{ + JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); + return JoystickLinuxWImpl_GetProperty(IDirectInputDevice8W_from_impl(This), rguid, pdiph); +} + +/****************************************************************************** * Unacquire : frees the joystick */ static HRESULT WINAPI JoystickLinuxWImpl_Unacquire(LPDIRECTINPUTDEVICE8W iface) @@ -655,7 +691,7 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_Release, JoystickAGenericImpl_GetCapabilities, IDirectInputDevice2AImpl_EnumObjects, - JoystickAGenericImpl_GetProperty, + JoystickLinuxAImpl_GetProperty, JoystickAGenericImpl_SetProperty, JoystickLinuxAImpl_Acquire, JoystickLinuxAImpl_Unacquire, @@ -691,7 +727,7 @@ static const IDirectInputDevice8WVtbl JoystickWvt = IDirectInputDevice2WImpl_Release, JoystickWGenericImpl_GetCapabilities, IDirectInputDevice2WImpl_EnumObjects, - JoystickWGenericImpl_GetProperty, + JoystickLinuxWImpl_GetProperty, JoystickWGenericImpl_SetProperty, JoystickLinuxWImpl_Acquire, JoystickLinuxWImpl_Unacquire, diff --git a/include/dinput.h b/include/dinput.h index a6cf7e2..3125800 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -905,6 +905,7 @@ typedef const DIPROPSTRING *LPCDIPROPSTRING; #define DIPROP_CALIBRATION MAKEDIPROP(11) #define DIPROP_GUIDANDPATH MAKEDIPROP(12) +#define DIPROP_JOYSTICKID MAKEDIPROP(15) #define DIPROP_KEYNAME MAKEDIPROP(20) #define DIPROP_VIDPID MAKEDIPROP(24)

1 0

Austin English : wine.inf: Add HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WinSock2\Parameters\Protocol_Catalog9\Catalog_Entries registry entry .
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: 29cac72d1ad794034bbf424b0e1f30ec634b2976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29cac72d1ad794034bbf424b0… Author: Austin English <austinenglish(a)gmail.com> Date: Tue May 29 11:39:46 2012 -0700 wine.inf: Add HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WinSock2\Parameters\Protocol_Catalog9\Catalog_Entries registry entry. --- tools/wine.inf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index abd5307..b182953 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -3047,7 +3047,7 @@ HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16 HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters",,16 HKLM,"System\CurrentControlSet\Services\Winsock\Parameters",,16 -HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters",,16 +HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Catalog_Entries",,16 [VersionInfo] HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.1"

1 0

Michael Geddes : kernel32: Add timed wait capability flag to COMM Port properties.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: d7dc0e6066de8a1cfe721e85bd187774709dcd46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7dc0e6066de8a1cfe721e85b… Author: Michael Geddes <michael(a)frog.wheelycreek.net> Date: Wed May 2 19:36:51 2012 +0800 kernel32: Add timed wait capability flag to COMM Port properties. --- dlls/kernel32/comm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index 096bc42..30fd44f 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -1154,7 +1154,7 @@ BOOL WINAPI GetCommProperties( lpCommProp->dwMaxRxQueue = 4096; lpCommProp->dwMaxBaud = BAUD_115200; lpCommProp->dwProvSubType = PST_RS232; - lpCommProp->dwProvCapabilities = PCF_DTRDSR | PCF_PARITY_CHECK | PCF_RTSCTS | PCF_TOTALTIMEOUTS; + lpCommProp->dwProvCapabilities = PCF_DTRDSR | PCF_PARITY_CHECK | PCF_RTSCTS | PCF_TOTALTIMEOUTS | PCF_INTTIMEOUTS; lpCommProp->dwSettableParams = SP_BAUD | SP_DATABITS | SP_HANDSHAKING | SP_PARITY | SP_PARITY_CHECK | SP_STOPBITS ; lpCommProp->dwSettableBaud = BAUD_075 | BAUD_110 | BAUD_134_5 | BAUD_150 |

1 0

Jacek Caban : jscript: Added missing port.h include to lex.c.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: de5495ba86e0a99ed94b2894298ea6708dbbbe83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de5495ba86e0a99ed94b28942… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 30 10:17:18 2012 +0200 jscript: Added missing port.h include to lex.c. --- dlls/jscript/lex.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 022c06e..06d0b89 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -16,7 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <math.h> +#include "config.h" +#include "wine/port.h" + #include <limits.h> #include "jscript.h"

1 0

Piotr Caban : msvcrt: Fixed typo in DEFINE_EXCEPTION_TYPE_INFO macro.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: 482159a2349706ed07f5bc84b21f328d44fe4a6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=482159a2349706ed07f5bc84b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 30 09:41:28 2012 +0200 msvcrt: Fixed typo in DEFINE_EXCEPTION_TYPE_INFO macro. --- dlls/msvcrt/cpp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 9564ff3..baf20b2 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -761,8 +761,8 @@ static const cxx_type_info_table name ## _type_info_table = \ base_classes+1, \ { \ &name ## _cxx_type_info, \ - cl2, \ - cl1 \ + cl1, \ + cl2 \ } \ }; \ \

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
74
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 May 2012