July 2011 - Wine-Commits - list.winehq.org

Alexandre Julliard : user32/tests: Fix test failures when the low-level hook cannot be set.
by Alexandre Julliard July 22, 2011

July 22, 2011

Module: wine Branch: master Commit: fb2df6752e1837380b52e16fb49ca55243132b80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb2df6752e1837380b52e16fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 22 12:00:58 2011 +0200 user32/tests: Fix test failures when the low-level hook cannot be set. --- dlls/user32/tests/msg.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 5fbf440..afca225 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2025,7 +2025,8 @@ static void ok_sequence_(const struct message *expected_list, const char *contex while (expected->message && actual->message) { - if (expected->message == actual->message) + if (expected->message == actual->message && + !((expected->flags ^ actual->flags) & (hook|winevent_hook|kbd_hook))) { if (expected->flags & wparam) { @@ -2130,7 +2131,8 @@ static void ok_sequence_(const struct message *expected_list, const char *contex /* silently drop hook messages if there is no support for them */ else if ((expected->flags & optional) || ((expected->flags & hook) && !hCBT_hook) || - ((expected->flags & winevent_hook) && !hEvent_hook)) + ((expected->flags & winevent_hook) && !hEvent_hook) || + ((expected->flags & kbd_hook) && !hKBD_hook)) expected++; else if (todo) { @@ -13213,7 +13215,7 @@ static void test_hotkey(void) } hKBD_hook = SetWindowsHookEx(WH_KEYBOARD_LL, KeyboardHookProc, GetModuleHandle(NULL), 0); - ok(hKBD_hook != NULL, "failed to install hook, err %i\n", GetLastError()); + if (!hKBD_hook) win_skip("WH_KEYBOARD_LL is not supported\n"); /* Same key combination, different id */ SetLastError(0xdeadbeef); @@ -13409,7 +13411,7 @@ static void test_hotkey(void) ret = UnregisterHotKey(NULL, 5); ok(ret == TRUE, "expected TRUE, got %i, err=%d\n", ret, GetLastError()); - UnhookWindowsHookEx(hKBD_hook); + if (hKBD_hook) UnhookWindowsHookEx(hKBD_hook); hKBD_hook = NULL; end:

1 0

Alexandre Julliard : user32/tests: Mark some messages optional in the SetParent sequence.
by Alexandre Julliard July 22, 2011

July 22, 2011

Module: wine Branch: master Commit: 5be95f40c5c03a0464ce1d79bff612966e88f298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5be95f40c5c03a0464ce1d79b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 22 11:46:27 2011 +0200 user32/tests: Mark some messages optional in the SetParent sequence. --- dlls/user32/tests/msg.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 2d903f0..01933b8 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12839,20 +12839,20 @@ static const struct message WmSetParentSeq_2[] = { { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam, 0, 0 }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { HCBT_SETFOCUS, hook|optional }, - { WM_NCACTIVATE, sent|wparam, 0 }, - { WM_ACTIVATE, sent|wparam, 0 }, - { WM_ACTIVATEAPP, sent|wparam, 0 }, + { WM_NCACTIVATE, sent|wparam|optional, 0 }, + { WM_ACTIVATE, sent|wparam|optional, 0 }, + { WM_ACTIVATEAPP, sent|wparam|optional, 0 }, { WM_KILLFOCUS, sent|wparam, 0 }, { EVENT_OBJECT_PARENTCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE }, { HCBT_ACTIVATE, hook }, { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, - { WM_NCACTIVATE, sent|wparam, 1 }, - { WM_ACTIVATE, sent|wparam, 1 }, + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_NCACTIVATE, sent|wparam|optional, 1 }, + { WM_ACTIVATE, sent|wparam|optional, 1 }, { HCBT_SETFOCUS, hook }, { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, - { WM_SETFOCUS, sent|defwinproc }, + { WM_SETFOCUS, sent|optional|defwinproc }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOREDRAW|SWP_NOSIZE|SWP_NOCLIENTSIZE }, { WM_MOVE, sent|defwinproc|wparam, 0 }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 },

1 0

Lucas Fialho Zawacki : dinput: BuildActionMap for all joysticks. For the moment only for buttons and axis.
by Alexandre Julliard July 22, 2011

July 22, 2011

Module: wine Branch: master Commit: 31fdae5b4cd0397107f3e32d9f2e073d12320c2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=31fdae5b4cd0397107f3e32d9… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Thu Jul 21 15:36:31 2011 -0300 dinput: BuildActionMap for all joysticks. For the moment only for buttons and axis. --- dlls/dinput/device.c | 23 +++++++++++++++++++++++ dlls/dinput/device_private.h | 1 + dlls/dinput/dinput_private.h | 1 + dlls/dinput/joystick.c | 40 +++++++++++++++++++++++++++++++++++++++- 4 files changed, 64 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 22632ea..2bd5d6c 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -366,6 +366,29 @@ static inline LPDIOBJECTDATAFORMAT dataformat_to_odf(LPCDIDATAFORMAT df, int idx return (LPDIOBJECTDATAFORMAT)((LPBYTE)df->rgodf + idx * df->dwObjSize); } +/* dataformat_to_odf_by_type + * Find the Nth object of the selected type in the DataFormat + */ +LPDIOBJECTDATAFORMAT dataformat_to_odf_by_type(LPCDIDATAFORMAT df, int n, DWORD type) +{ + int i, nfound = 0; + + for (i=0; i < df->dwNumObjs; i++) + { + LPDIOBJECTDATAFORMAT odf = dataformat_to_odf(df, i); + + if (odf->dwType & type) + { + if (n == nfound) + return odf; + + nfound++; + } + } + + return NULL; +} + static HRESULT create_DataFormat(LPCDIDATAFORMAT asked_format, DataFormat *format) { DataTransform *dt; diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 503698a..6c061b2 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -125,6 +125,7 @@ extern void _dump_DIDATAFORMAT(const DIDATAFORMAT *df) DECLSPEC_HIDDEN; extern const char *_dump_dinput_GUID(const GUID *guid) DECLSPEC_HIDDEN; extern DWORD semantic_to_obj_id(IDirectInputDeviceImpl* This, DWORD dwSemantic) DECLSPEC_HIDDEN; +extern LPDIOBJECTDATAFORMAT dataformat_to_odf_by_type(LPCDIDATAFORMAT df, int n, DWORD type) DECLSPEC_HIDDEN; /* And the stubs */ extern HRESULT WINAPI IDirectInputDevice2AImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index 6573de0..3c4776e 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -71,5 +71,6 @@ extern void _copy_diactionformatWtoA(LPDIACTIONFORMATA, LPDIACTIONFORMATW) DECLS #define DIKEYBOARD_MASK 0x81000000 #define DIMOUSE_MASK 0x82000000 +#define DIGENRE_ANY 0xFF000000 #endif /* __WINE_DLLS_DINPUT_DINPUT_PRIVATE_H */ diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 68dcc6a..b5c028c 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -432,9 +432,47 @@ HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, LPCWSTR lpszUserName, DWORD dwFlags) { + JoystickGenericImpl *This = impl_from_IDirectInputDevice8W(iface); + int i, j, has_actions = 0; + DWORD object_types[] = { DIDFT_AXIS, DIDFT_BUTTON }; + DWORD type_map[] = { DIDFT_RELAXIS, DIDFT_PSHBUTTON }; + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); - return DI_NOEFFECT; + for (i=0; i < lpdiaf->dwNumActions; i++) + { + DWORD inst = (0x000000ff & (lpdiaf->rgoAction[i].dwSemantic)) - 1; + DWORD type = 0x000000ff & (lpdiaf->rgoAction[i].dwSemantic >> 8); + DWORD genre = 0xff000000 & lpdiaf->rgoAction[i].dwSemantic; + + /* Only consider actions of the right genre */ + if (lpdiaf->dwGenre != genre && genre != DIGENRE_ANY) continue; + + for (j=0; j < sizeof(object_types)/sizeof(object_types[0]); j++) + { + if (type & object_types[j]) + { + /* Assure that the object exists */ + LPDIOBJECTDATAFORMAT odf = dataformat_to_odf_by_type(This->base.data_format.wine_df, inst, DIDFT_BUTTON); + + if (odf != NULL) + { + lpdiaf->rgoAction[i].dwObjID = type_map[j] | (0x0000ff00 & (inst << 8)); + lpdiaf->rgoAction[i].guidInstance = This->base.guid; + lpdiaf->rgoAction[i].dwHow = DIAH_DEFAULT; + + has_actions = 1; + + /* No need to try other types if the action was already mapped */ + break; + } + } + } + } + + if (!has_actions) return DI_NOEFFECT; + + return IDirectInputDevice8WImpl_BuildActionMap(iface, lpdiaf, lpszUserName, dwFlags); } HRESULT WINAPI JoystickAGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8A iface,

1 0

Lucas Fialho Zawacki : dinput: SetActionMap for joysticks.
by Alexandre Julliard July 22, 2011

July 22, 2011

Module: wine Branch: master Commit: 79bd7249e471bbdeb665547a1a3a75454c6c41f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79bd7249e471bbdeb665547a1… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Thu Jul 21 15:38:43 2011 -0300 dinput: SetActionMap for joysticks. --- dlls/dinput/joystick.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 59 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index b5c028c..2d8a818 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -500,9 +500,67 @@ HRESULT WINAPI JoystickWGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, LPCWSTR lpszUserName, DWORD dwFlags) { + JoystickGenericImpl *This = impl_from_IDirectInputDevice8W(iface); + DIDATAFORMAT data_format; + DIOBJECTDATAFORMAT *obj_df = NULL; + int i, action = 0, num_actions = 0; + unsigned int offset = 0; + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); - return DI_NOEFFECT; + if (This->base.acquired) return DIERR_ACQUIRED; + + data_format.dwSize = sizeof(data_format); + data_format.dwObjSize = sizeof(DIOBJECTDATAFORMAT); + data_format.dwFlags = DIDF_RELAXIS; + data_format.dwDataSize = lpdiaf->dwDataSize; + + /* count the actions */ + for (i=0; i < lpdiaf->dwNumActions; i++) + if (IsEqualGUID(&This->base.guid, &lpdiaf->rgoAction[i].guidInstance)) + num_actions++; + + if (num_actions == 0) return DI_NOEFFECT; + + This->base.num_actions = num_actions; + + /* Construct the dataformat and actionmap */ + obj_df = HeapAlloc(GetProcessHeap(), 0, sizeof(DIOBJECTDATAFORMAT)*num_actions); + data_format.rgodf = (LPDIOBJECTDATAFORMAT)obj_df; + data_format.dwNumObjs = num_actions; + + This->base.action_map = HeapAlloc(GetProcessHeap(), 0, sizeof(ActionMap)*num_actions); + + for (i = 0; i < lpdiaf->dwNumActions; i++) + { + if (IsEqualGUID(&This->base.guid, &lpdiaf->rgoAction[i].guidInstance)) + { + LPDIDATAFORMAT df = This->base.data_format.wine_df; + DWORD inst = DIDFT_GETINSTANCE(lpdiaf->rgoAction[i].dwObjID); + DWORD type = DIDFT_GETTYPE(lpdiaf->rgoAction[i].dwObjID); + LPDIOBJECTDATAFORMAT obj; + + if (type == DIDFT_PSHBUTTON) type = DIDFT_BUTTON; + if (type == DIDFT_RELAXIS) type = DIDFT_AXIS; + + obj = dataformat_to_odf_by_type(df, inst, type); + + memcpy(&obj_df[action], obj, df->dwObjSize); + + This->base.action_map[action].uAppData = lpdiaf->rgoAction[i].uAppData; + This->base.action_map[action].offset = offset; + obj_df[action].dwOfs = offset; + offset += (type & DIDFT_BUTTON) ? 1 : 4; + + action++; + } + } + + IDirectInputDevice8_SetDataFormat(iface, &data_format); + + HeapFree(GetProcessHeap(), 0, obj_df); + + return IDirectInputDevice8WImpl_SetActionMap(iface, lpdiaf, lpszUserName, dwFlags); } HRESULT WINAPI JoystickAGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface,

1 0

Francois Gouget : po: A French translation fixe and a tweak.
by Alexandre Julliard July 22, 2011

July 22, 2011

Module: wine Branch: master Commit: 51b3100aa60d29b2269c47f968a9df271471caee URL: http://source.winehq.org/git/wine.git/?a=commit;h=51b3100aa60d29b2269c47f96… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jul 22 10:37:21 2011 +0200 po: A French translation fixe and a tweak. --- po/fr.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index b06d632..bc1215d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9698,7 +9698,7 @@ msgstr "" "/? Afficher cette aide et se terminer.\n" "\n" "start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n" -"Start est fourni sans AUCUNE GARANTIE ; pour plus de détails lancez le avec\n" +"Start est fourni sans AUCUNE GARANTIE ; pour plus de détails lancez-le avec\n" "l'option /L.\n" "Ceci est un logiciel libre, et vous êtes invité à le redistribuer\n" "sous certaines conditions ; lancez « start /L » pour plus de détails.\n" @@ -11032,7 +11032,7 @@ msgstr "Gestionnaire de fichiers de Wine" #: winefile.rc:101 msgid "root fs" -msgstr "fs racine" +msgstr "dossier racine" #: winefile.rc:102 msgid "unixfs"

1 0

Jacek Caban : mshtml: Added IHTMLStyle2::direction property implementation.
by Alexandre Julliard July 22, 2011

July 22, 2011

Module: wine Branch: master Commit: adf1310f4acfc1d4cf48d30ca0ffc32c14dee4aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=adf1310f4acfc1d4cf48d30ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 22 11:40:17 2011 +0200 mshtml: Added IHTMLStyle2::direction property implementation. --- dlls/mshtml/htmlstyle.c | 3 +++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/htmlstyle2.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 17 +++++++++++++++++ 4 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 5c6157b..ae2cf93 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -97,6 +97,8 @@ static const WCHAR attrColor[] = {'c','o','l','o','r',0}; static const WCHAR attrCursor[] = {'c','u','r','s','o','r',0}; +static const WCHAR attrDirection[] = + {'d','i','r','e','c','t','i','o','n',0}; static const WCHAR attrDisplay[] = {'d','i','s','p','l','a','y',0}; static const WCHAR attrFilter[] = @@ -207,6 +209,7 @@ static const struct{ {attrClip, DISPID_IHTMLSTYLE_CLIP}, {attrColor, DISPID_IHTMLSTYLE_COLOR}, {attrCursor, DISPID_IHTMLSTYLE_CURSOR}, + {attrDirection, DISPID_IHTMLSTYLE2_DIRECTION}, {attrDisplay, DISPID_IHTMLSTYLE_DISPLAY}, {attrFilter, DISPID_IHTMLSTYLE_FILTER}, {attrFontFamily, DISPID_IHTMLSTYLE_FONTFAMILY}, diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index b4d9662..f23d911 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -62,6 +62,7 @@ typedef enum { STYLEID_CLIP, STYLEID_COLOR, STYLEID_CURSOR, + STYLEID_DIRECTION, STYLEID_DISPLAY, STYLEID_FILTER, STYLEID_FONT_FAMILY, diff --git a/dlls/mshtml/htmlstyle2.c b/dlls/mshtml/htmlstyle2.c index db44581..a270833 100644 --- a/dlls/mshtml/htmlstyle2.c +++ b/dlls/mshtml/htmlstyle2.c @@ -121,15 +121,19 @@ static HRESULT WINAPI HTMLStyle2_get_borderCollapse(IHTMLStyle2 *iface, BSTR *p) static HRESULT WINAPI HTMLStyle2_put_direction(IHTMLStyle2 *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_nsstyle_attr(This->nsstyle, STYLEID_DIRECTION, v, 0); } static HRESULT WINAPI HTMLStyle2_get_direction(IHTMLStyle2 *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr(This->nsstyle, STYLEID_DIRECTION, p, 0); } static HRESULT WINAPI HTMLStyle2_put_behavior(IHTMLStyle2 *iface, BSTR v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index e9061a2..d4d9a20 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -277,6 +277,23 @@ static void test_style2(IHTMLStyle2 *style2) ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); ok(!strcmp_wa(V_BSTR(&v), "3px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + + /* direction */ + str = (void*)0xdeadbeef; + hres = IHTMLStyle2_get_direction(style2, &str); + ok(hres == S_OK, "get_direction failed: %08x\n", hres); + ok(!str, "str = %s\n", wine_dbgstr_w(str)); + + str = a2bstr("ltr"); + hres = IHTMLStyle2_put_direction(style2, str); + ok(hres == S_OK, "put_direction failed: %08x\n", hres); + SysFreeString(str); + + str = NULL; + hres = IHTMLStyle2_get_direction(style2, &str); + ok(hres == S_OK, "get_direction failed: %08x\n", hres); + ok(!strcmp_wa(str, "ltr"), "str = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); } static void test_style3(IHTMLStyle3 *style3)

1 0

Juan Lang : wininet: De-Hungarian proxyinfo_t.
by Alexandre Julliard July 22, 2011

July 22, 2011

Module: wine Branch: master Commit: 027238f856fa50471bcfe836719cf170b3bbf84c URL: http://source.winehq.org/git/wine.git/?a=commit;h=027238f856fa50471bcfe8367… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 21 12:54:27 2011 -0700 wininet: De-Hungarian proxyinfo_t. --- dlls/wininet/internet.c | 60 +++++++++++++++++++++++----------------------- 1 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index c865368..90dd27e 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -105,9 +105,9 @@ static UINT_PTR handle_table_size; typedef struct { - DWORD dwProxyEnabled; - LPWSTR lpszProxyServer; - LPWSTR lpszProxyBypass; + DWORD proxyEnabled; + LPWSTR proxy; + LPWSTR proxyBypass; } proxyinfo_t; static const WCHAR szInternetSettings[] = @@ -337,15 +337,15 @@ static LONG INTERNET_SaveProxySettings( proxyinfo_t *lpwpi ) if ((ret = RegOpenKeyW( HKEY_CURRENT_USER, szInternetSettings, &key ))) return ret; - if ((ret = RegSetValueExW( key, szProxyEnable, 0, REG_DWORD, (BYTE*)&lpwpi->dwProxyEnabled, sizeof(DWORD)))) + if ((ret = RegSetValueExW( key, szProxyEnable, 0, REG_DWORD, (BYTE*)&lpwpi->proxyEnabled, sizeof(DWORD)))) { RegCloseKey( key ); return ret; } - if (lpwpi->lpszProxyServer) + if (lpwpi->proxy) { - if ((ret = RegSetValueExW( key, szProxyServer, 0, REG_SZ, (BYTE*)lpwpi->lpszProxyServer, sizeof(WCHAR) * (lstrlenW(lpwpi->lpszProxyServer) + 1)))) + if ((ret = RegSetValueExW( key, szProxyServer, 0, REG_SZ, (BYTE*)lpwpi->proxy, sizeof(WCHAR) * (lstrlenW(lpwpi->proxy) + 1)))) { RegCloseKey( key ); return ret; @@ -494,8 +494,8 @@ BOOL WINAPI DetectAutoProxyUrl(LPSTR lpszAutoProxyUrl, static void FreeProxyInfo( proxyinfo_t *lpwpi ) { - heap_free(lpwpi->lpszProxyServer); - heap_free(lpwpi->lpszProxyBypass); + heap_free(lpwpi->proxy); + heap_free(lpwpi->proxyBypass); } /*********************************************************************** @@ -520,17 +520,17 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) return ret; len = sizeof(DWORD); - if (RegQueryValueExW( key, szProxyEnable, NULL, &type, (BYTE *)&lpwpi->dwProxyEnabled, &len ) || type != REG_DWORD) + if (RegQueryValueExW( key, szProxyEnable, NULL, &type, (BYTE *)&lpwpi->proxyEnabled, &len ) || type != REG_DWORD) { - lpwpi->dwProxyEnabled = 0; - if((ret = RegSetValueExW( key, szProxyEnable, 0, REG_DWORD, (BYTE *)&lpwpi->dwProxyEnabled, sizeof(DWORD) ))) + lpwpi->proxyEnabled = 0; + if((ret = RegSetValueExW( key, szProxyEnable, 0, REG_DWORD, (BYTE *)&lpwpi->proxyEnabled, sizeof(DWORD) ))) { RegCloseKey( key ); return ret; } } - if (!(envproxy = getenv( "http_proxy" )) || lpwpi->dwProxyEnabled) + if (!(envproxy = getenv( "http_proxy" )) || lpwpi->proxyEnabled) { TRACE("Proxy is enabled.\n"); @@ -557,14 +557,14 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) p = strchrW( szProxy, ' ' ); if (p) *p = 0; - lpwpi->lpszProxyServer = szProxy; + lpwpi->proxy = szProxy; - TRACE("http proxy = %s\n", debugstr_w(lpwpi->lpszProxyServer)); + TRACE("http proxy = %s\n", debugstr_w(lpwpi->proxy)); } else { TRACE("No proxy server settings in registry.\n"); - lpwpi->lpszProxyServer = NULL; + lpwpi->proxy = NULL; } } else if (envproxy) @@ -576,14 +576,14 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) return ERROR_OUTOFMEMORY; MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, envproxyW, len ); - lpwpi->dwProxyEnabled = 1; - lpwpi->lpszProxyServer = envproxyW; + lpwpi->proxyEnabled = 1; + lpwpi->proxy = envproxyW; - TRACE("http proxy (from environment) = %s\n", debugstr_w(lpwpi->lpszProxyServer)); + TRACE("http proxy (from environment) = %s\n", debugstr_w(lpwpi->proxy)); } RegCloseKey( key ); - lpwpi->lpszProxyBypass = NULL; + lpwpi->proxyBypass = NULL; return ERROR_SUCCESS; } @@ -598,10 +598,10 @@ static BOOL INTERNET_ConfigureProxy( appinfo_t *lpwai ) if (INTERNET_LoadProxySettings( &wpi )) return FALSE; - if (wpi.dwProxyEnabled) + if (wpi.proxyEnabled) { lpwai->accessType = INTERNET_OPEN_TYPE_PROXY; - lpwai->proxy = wpi.lpszProxyServer; + lpwai->proxy = wpi.proxy; return TRUE; } @@ -2333,7 +2333,7 @@ DWORD INET_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD * switch (optionW->dwOption) { case INTERNET_PER_CONN_FLAGS: - if(pi.dwProxyEnabled) + if(pi.proxyEnabled) optionW->Value.dwValue = PROXY_TYPE_PROXY; else optionW->Value.dwValue = PROXY_TYPE_DIRECT; @@ -2341,16 +2341,16 @@ DWORD INET_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD * case INTERNET_PER_CONN_PROXY_SERVER: if (unicode) - optionW->Value.pszValue = heap_strdupW(pi.lpszProxyServer); + optionW->Value.pszValue = heap_strdupW(pi.proxy); else - optionA->Value.pszValue = heap_strdupWtoA(pi.lpszProxyServer); + optionA->Value.pszValue = heap_strdupWtoA(pi.proxy); break; case INTERNET_PER_CONN_PROXY_BYPASS: if (unicode) - optionW->Value.pszValue = heap_strdupW(pi.lpszProxyBypass); + optionW->Value.pszValue = heap_strdupW(pi.proxyBypass); else - optionA->Value.pszValue = heap_strdupWtoA(pi.lpszProxyBypass); + optionA->Value.pszValue = heap_strdupWtoA(pi.proxyBypass); break; case INTERNET_PER_CONN_AUTOCONFIG_URL: @@ -2669,18 +2669,18 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, switch (option->dwOption) { case INTERNET_PER_CONN_PROXY_SERVER: - heap_free(pi.lpszProxyServer); - pi.lpszProxyServer = heap_strdupW(option->Value.pszValue); + heap_free(pi.proxy); + pi.proxy = heap_strdupW(option->Value.pszValue); break; case INTERNET_PER_CONN_FLAGS: if(option->Value.dwValue & PROXY_TYPE_PROXY) - pi.dwProxyEnabled = 1; + pi.proxyEnabled = 1; else { if(option->Value.dwValue != PROXY_TYPE_DIRECT) FIXME("Unhandled flags: 0x%x\n", option->Value.dwValue); - pi.dwProxyEnabled = 0; + pi.proxyEnabled = 0; } break;

1 0

Henri Verbeet : wined3d: Make the tex_unit_map parameter to shader_glsl_load_vsamplers() const.
by Alexandre Julliard July 22, 2011

July 22, 2011

Module: wine Branch: master Commit: 959874c2d88f616c4706ab6558b95ddf4cc71e29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=959874c2d88f616c4706ab655… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 21 19:16:03 2011 +0200 wined3d: Make the tex_unit_map parameter to shader_glsl_load_vsamplers() const. --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b046263..dec690e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -376,7 +376,7 @@ static void shader_glsl_load_psamplers(const struct wined3d_gl_info *gl_info, /* GL locking is done by the caller */ static void shader_glsl_load_vsamplers(const struct wined3d_gl_info *gl_info, - DWORD *tex_unit_map, GLhandleARB programId) + const DWORD *tex_unit_map, GLhandleARB programId) { GLint name_loc; char sampler_name[20];

1 0

André Hentschel : user32/tests: Fix two typos.
by Alexandre Julliard July 22, 2011

July 22, 2011

Module: wine Branch: master Commit: 54ca4034cff3889ae1997ec1332486d7660bd5c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54ca4034cff3889ae1997ec13… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jul 21 20:27:14 2011 +0200 user32/tests: Fix two typos. --- dlls/user32/tests/dialog.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 5964931..1a1cd75 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -642,7 +642,7 @@ static void test_WM_NEXTDLGCTL(void) "Button1 style not set to BS_DEFPUSHBUTTON\n" ); ok ( !((GetWindowLong( g_hwndTestDlgBut2, GWL_STYLE)) & BS_DEFPUSHBUTTON), - "Button2's style not chaged to BS_PUSHBUTTON\n" ); + "Button2's style not changed to BS_PUSHBUTTON\n" ); } /* @@ -667,7 +667,7 @@ static void test_WM_NEXTDLGCTL(void) "Button2 style not set to BS_DEFPUSHBUTTON\n" ); ok ( !((GetWindowLong( g_hwndTestDlgBut1, GWL_STYLE)) & BS_DEFPUSHBUTTON), - "Button1's style not chaged to BS_PUSHBUTTON\n" ); + "Button1's style not changed to BS_PUSHBUTTON\n" ); } /*

1 0

Lucas Fialho Zawacki : dinput: EnumDevicesBySemantics enumerate joysticks with priority flags.
by Alexandre Julliard July 22, 2011

July 22, 2011

Module: wine Branch: master Commit: 6e098f90a6ec5bc9cec657996569ec2418d04ca8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e098f90a6ec5bc9cec657996… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Thu Jul 21 15:36:00 2011 -0300 dinput: EnumDevicesBySemantics enumerate joysticks with priority flags. --- dlls/dinput/dinput_main.c | 50 ++++++++++++++++++++++++++++++++------------ 1 files changed, 36 insertions(+), 14 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index b653307..37b4673 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -317,6 +317,38 @@ void _copy_diactionformatWtoA(LPDIACTIONFORMATA to, LPDIACTIONFORMATW from) } } +/* _diactionformat_priority + * + * Given a DIACTIONFORMAT structure and a DI genre, returns the enumeration + * priority. Joysticks should pass the game genre, and mouse or keyboard their + * respective DI*_MASK + */ +static DWORD _diactionformat_priorityA(LPDIACTIONFORMATA lpdiaf, DWORD genre) +{ + int i; + DWORD priorityFlags = 0; + + /* If there's at least one action for the device it's priority 1 */ + for(i=0; i < lpdiaf->dwActionSize; i++) + if ((lpdiaf->rgoAction[i].dwSemantic & genre) == genre) + priorityFlags |= DIEDBS_MAPPEDPRI1; + + return priorityFlags; +} + +static DWORD _diactionformat_priorityW(LPDIACTIONFORMATW lpdiaf, DWORD genre) +{ + int i; + DWORD priorityFlags = 0; + + /* If there's at least one action for the device it's priority 1 */ + for(i=0; i < lpdiaf->dwActionSize; i++) + if ((lpdiaf->rgoAction[i].dwSemantic & genre) == genre) + priorityFlags |= DIEDBS_MAPPEDPRI1; + + return priorityFlags; +} + /****************************************************************************** * IDirectInputA_EnumDevices */ @@ -877,7 +909,7 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( { TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); - callbackFlags = 0; + callbackFlags = _diactionformat_priorityA(lpdiActionFormat, lpdiActionFormat->dwGenre); /* Default behavior is to enumerate attached game controllers */ enumSuccess = dinput_devices[i]->enum_deviceA(DI8DEVCLASS_GAMECTRL, DIEDFL_ATTACHEDONLY | dwFlags, &didevi, This->dwVersion, j); if (enumSuccess) @@ -895,16 +927,11 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( /* Enumerate keyboard and mouse */ for(i=0; i < sizeof(guids)/sizeof(guids[0]); i++) { - callbackFlags = 0; + callbackFlags = _diactionformat_priorityA(lpdiActionFormat, actionMasks[i]); IDirectInput_CreateDevice(iface, guids[i], &lpdid, NULL); IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); - /* If there's at least one action for the device it's priority 1 */ - for(j=0; j < lpdiActionFormat->dwActionSize; j++) - if ((lpdiActionFormat->rgoAction[j].dwSemantic & actionMasks[i]) == actionMasks[i]) - callbackFlags |= DIEDBS_MAPPEDPRI1; - if (lpCallback(&didevi, lpdid, callbackFlags, sizeof(guids)/sizeof(guids[0]) - (i+1), pvRef) == DIENUM_STOP) return DI_OK; } @@ -942,7 +969,7 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( { TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); - callbackFlags = 0; + callbackFlags = _diactionformat_priorityW(lpdiActionFormat, lpdiActionFormat->dwGenre); /* Default behavior is to enumerate attached game controllers */ enumSuccess = dinput_devices[i]->enum_deviceW(DI8DEVCLASS_GAMECTRL, DIEDFL_ATTACHEDONLY | dwFlags, &didevi, This->dwVersion, j); if (enumSuccess) @@ -960,16 +987,11 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( /* Enumerate keyboard and mouse */ for(i=0; i < sizeof(guids)/sizeof(guids[0]); i++) { - callbackFlags = 0; + callbackFlags = _diactionformat_priorityW(lpdiActionFormat, actionMasks[i]); IDirectInput_CreateDevice(iface, guids[i], &lpdid, NULL); IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); - /* If there's at least one action for the device it's priority 1 */ - for(j=0; j < lpdiActionFormat->dwActionSize; j++) - if ((lpdiActionFormat->rgoAction[j].dwSemantic & actionMasks[i]) == actionMasks[i]) - callbackFlags |= DIEDBS_MAPPEDPRI1; - if (lpCallback(&didevi, lpdid, callbackFlags, sizeof(guids)/sizeof(guids[0]) - (i+1), pvRef) == DIENUM_STOP) return DI_OK; }

1 0