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

Lucas Fialho Zawacki : dinput: SetActionMap setting the axis range according to the action format.
by Alexandre Julliard 22 Jul '11

22 Jul '11

Module: wine Branch: master Commit: 8cc44cb8c38e390d9fa5ae9ed69764f31a6c8513 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cc44cb8c38e390d9fa5ae9ed… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Thu Jul 21 15:37:15 2011 -0300 dinput: SetActionMap setting the axis range according to the action format. --- dlls/dinput/device.c | 8 ++++++++ dlls/dinput8/tests/device.c | 15 +++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 2bd5d6c..58d4e14 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1483,9 +1483,17 @@ HRESULT WINAPI IDirectInputDevice8WImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface DWORD dwFlags) { DIPROPDWORD dp; + DIPROPRANGE dpr; FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); + dpr.diph.dwSize = sizeof(DIPROPRANGE); + dpr.lMin = lpdiaf->lAxisMin; + dpr.lMax = lpdiaf->lAxisMax; + dpr.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dpr.diph.dwHow = DIPH_DEVICE; + IDirectInputDevice8_SetProperty(iface, DIPROP_RANGE, &dpr.diph); + if (lpdiaf->dwBufferSize > 0) { dp.diph.dwSize = sizeof(DIPROPDWORD); diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index cedad80..31e2e3f 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -132,6 +132,7 @@ static BOOL CALLBACK enumeration_callback( { HRESULT hr; DIPROPDWORD dp; + DIPROPRANGE dpr; struct enum_data *data = pvRef; if (!data) return DIENUM_CONTINUE; @@ -179,6 +180,20 @@ static BOOL CALLBACK enumeration_callback( ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr); ok (dp.dwData == data->lpdiaf->dwBufferSize, "SetActionMap must set the buffer, buffersize=%d\n", dp.dwData); + /* Test axis range */ + memset(&dpr, 0, sizeof(dpr)); + dpr.diph.dwSize = sizeof(dpr); + dpr.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dpr.diph.dwHow = DIPH_DEVICE; + + hr = IDirectInputDevice_GetProperty(lpdid, DIPROP_RANGE, &dpr.diph); + /* Only test if device supports the range property */ + if (SUCCEEDED(hr)) + { + ok (dpr.lMin == data->lpdiaf->lAxisMin, "SetActionMap must set the min axis range expected=%d got=%d\n", data->lpdiaf->lAxisMin, dpr.lMin); + ok (dpr.lMax == data->lpdiaf->lAxisMax, "SetActionMap must set the max axis range expected=%d got=%d\n", data->lpdiaf->lAxisMax, dpr.lMax); + } + /* SetActionMap has set the data format so now it should work */ hr = IDirectInputDevice8_Acquire(lpdid); ok (SUCCEEDED(hr), "Acquire failed hr=%08x\n", hr);

1 0

Alexandre Julliard : user32/tests: Mark some messages optional in the SetParent sequence.
by Alexandre Julliard 22 Jul '11

22 Jul '11

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

Alexandre Julliard : user32/tests: Fix some last error tests that fail on Windows.
by Alexandre Julliard 22 Jul '11

22 Jul '11

Module: wine Branch: master Commit: a900fe7c9e751222e02b3dd031334b01b087ac23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a900fe7c9e751222e02b3dd03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 22 12:00:12 2011 +0200 user32/tests: Fix some last error tests that fail on Windows. --- dlls/user32/tests/msg.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 01933b8..5fbf440 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13169,7 +13169,8 @@ static void test_hotkey(void) SetLastError(0xdeadbeef); ret = UnregisterHotKey(NULL, 0); ok(ret == FALSE, "expected FALSE, got %i\n", ret); - ok(GetLastError() == ERROR_HOTKEY_NOT_REGISTERED, "unexpected error %d\n", GetLastError()); + ok(GetLastError() == ERROR_HOTKEY_NOT_REGISTERED || broken(GetLastError() == 0xdeadbeef), + "unexpected error %d\n", GetLastError()); if (ret == TRUE) { @@ -13185,7 +13186,8 @@ static void test_hotkey(void) SetLastError(0xdeadbeef); ret = UnregisterHotKey(test_window, 0); ok(ret == FALSE, "expected FALSE, got %i\n", ret); - ok(GetLastError() == ERROR_HOTKEY_NOT_REGISTERED, "unexpected error %d\n", GetLastError()); + ok(GetLastError() == ERROR_HOTKEY_NOT_REGISTERED || broken(GetLastError() == 0xdeadbeef), + "unexpected error %d\n", GetLastError()); /* Search for a Windows Key + letter combination that hasn't been registered */ for (hotkey_letter = 0x41; hotkey_letter <= 0x51; hotkey_letter ++) @@ -13199,7 +13201,8 @@ static void test_hotkey(void) } else { - ok(GetLastError() == ERROR_HOTKEY_ALREADY_REGISTERED, "unexpected error %d\n", GetLastError()); + ok(GetLastError() == ERROR_HOTKEY_ALREADY_REGISTERED || broken(GetLastError() == 0xdeadbeef), + "unexpected error %d\n", GetLastError()); } } @@ -13216,19 +13219,22 @@ static void test_hotkey(void) SetLastError(0xdeadbeef); ret = RegisterHotKey(test_window, 4, MOD_WIN, hotkey_letter); ok(ret == FALSE, "expected FALSE, got %i\n", ret); - ok(GetLastError() == ERROR_HOTKEY_ALREADY_REGISTERED, "unexpected error %d\n", GetLastError()); + ok(GetLastError() == ERROR_HOTKEY_ALREADY_REGISTERED || broken(GetLastError() == 0xdeadbeef), + "unexpected error %d\n", GetLastError()); /* Same key combination, different window */ SetLastError(0xdeadbeef); ret = RegisterHotKey(NULL, 5, MOD_WIN, hotkey_letter); ok(ret == FALSE, "expected FALSE, got %i\n", ret); - ok(GetLastError() == ERROR_HOTKEY_ALREADY_REGISTERED, "unexpected error %d\n", GetLastError()); + ok(GetLastError() == ERROR_HOTKEY_ALREADY_REGISTERED || broken(GetLastError() == 0xdeadbeef), + "unexpected error %d\n", GetLastError()); /* Register the same hotkey twice */ SetLastError(0xdeadbeef); ret = RegisterHotKey(test_window, 5, MOD_WIN, hotkey_letter); ok(ret == FALSE, "expected FALSE, got %i\n", ret); - ok(GetLastError() == ERROR_HOTKEY_ALREADY_REGISTERED, "unexpected error %d\n", GetLastError()); + ok(GetLastError() == ERROR_HOTKEY_ALREADY_REGISTERED || broken(GetLastError() == 0xdeadbeef), + "unexpected error %d\n", GetLastError()); /* Window on another thread */ taskbar_window = FindWindowA("Shell_TrayWnd", NULL); @@ -13241,7 +13247,8 @@ static void test_hotkey(void) SetLastError(0xdeadbeef); ret = RegisterHotKey(taskbar_window, 5, 0, hotkey_letter); ok(ret == FALSE, "expected FALSE, got %i\n", ret); - ok(GetLastError() == ERROR_WINDOW_OF_OTHER_THREAD, "unexpected error %d\n", GetLastError()); + ok(GetLastError() == ERROR_WINDOW_OF_OTHER_THREAD || broken(GetLastError() == 0xdeadbeef), + "unexpected error %d\n", GetLastError()); } /* Inject the appropriate key sequence */ @@ -13345,7 +13352,8 @@ static void test_hotkey(void) SetLastError(0xdeadbeef); ret = UnregisterHotKey(test_window, 5); ok(ret == FALSE, "expected FALSE, got %i\n", ret); - ok(GetLastError() == ERROR_HOTKEY_NOT_REGISTERED, "unexpected error %d\n", GetLastError()); + ok(GetLastError() == ERROR_HOTKEY_NOT_REGISTERED || broken(GetLastError() == 0xdeadbeef), + "unexpected error %d\n", GetLastError()); /* Register thread hotkey */ ret = RegisterHotKey(NULL, 5, MOD_WIN, hotkey_letter);

1 0

Alexandre Julliard : user32/tests: Fix test failures when the low-level hook cannot be set.
by Alexandre Julliard 22 Jul '11

22 Jul '11

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

Francois Gouget : po: A French translation fixe and a tweak.
by Alexandre Julliard 22 Jul '11

22 Jul '11

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 22 Jul '11

22 Jul '11

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

Henri Verbeet : wined3d: Make the tex_unit_map parameter to shader_glsl_load_vsamplers() const.
by Alexandre Julliard 22 Jul '11

22 Jul '11

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

Henri Verbeet : wined3d: Make the heap parameter to update_heap_entry() const.
by Alexandre Julliard 22 Jul '11

22 Jul '11

Module: wine Branch: master Commit: dbcbf0c45b21915672fca6811c24a8ddd5753fcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbcbf0c45b21915672fca6811… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 21 19:16:04 2011 +0200 wined3d: Make the heap parameter to update_heap_entry() 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 dec690e..d421e65 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -852,7 +852,7 @@ static void shader_glsl_load_constants(const struct wined3d_context *context, } } -static inline void update_heap_entry(struct constant_heap *heap, unsigned int idx, +static void update_heap_entry(const struct constant_heap *heap, unsigned int idx, unsigned int heap_idx, DWORD new_version) { struct constant_entry *entries = heap->entries;

1 0

Juan Lang : wininet: De-Hungarian proxyinfo_t.
by Alexandre Julliard 22 Jul '11

22 Jul '11

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

Juan Lang : wininet: Implement setting proxy options globally for a process .
by Alexandre Julliard 22 Jul '11

22 Jul '11

Module: wine Branch: master Commit: cfdce43de93bf66a126a297f85721a4e42b24755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfdce43de93bf66a126a297f8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 21 13:17:21 2011 -0700 wininet: Implement setting proxy options globally for a process. --- dlls/wininet/internet.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 66 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 90dd27e..c949f5d 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -498,10 +498,24 @@ static void FreeProxyInfo( proxyinfo_t *lpwpi ) heap_free(lpwpi->proxyBypass); } +static proxyinfo_t *global_proxy; + +static void free_global_proxy( void ) +{ + EnterCriticalSection( &WININET_cs ); + if (global_proxy) + { + FreeProxyInfo( global_proxy ); + heap_free( global_proxy ); + } + LeaveCriticalSection( &WININET_cs ); +} + /*********************************************************************** * INTERNET_LoadProxySettings * - * Loads proxy information from the registry or environment into lpwpi. + * Loads proxy information from process-wide global settings, the registry, + * or the environment into lpwpi. * * The caller should call FreeProxyInfo when done with lpwpi. * @@ -516,6 +530,15 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) LPCSTR envproxy; LONG ret; + EnterCriticalSection( &WININET_cs ); + if (global_proxy) + { + lpwpi->proxyEnabled = global_proxy->proxyEnabled; + lpwpi->proxy = heap_strdupW( global_proxy->proxy ); + lpwpi->proxyBypass = heap_strdupW( global_proxy->proxyBypass ); + } + LeaveCriticalSection( &WININET_cs ); + if ((ret = RegOpenKeyW( HKEY_CURRENT_USER, szInternetSettings, &key ))) return ret; @@ -2538,6 +2561,48 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, lpwhh->ErrorMask = *(ULONG*)lpBuffer; } break; + case INTERNET_OPTION_PROXY: + { + INTERNET_PROXY_INFOW *info = lpBuffer; + + if (!lpBuffer || dwBufferLength < sizeof(INTERNET_PROXY_INFOW)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (!hInternet) + { + EnterCriticalSection( &WININET_cs ); + free_global_proxy(); + global_proxy = heap_alloc( sizeof(proxyinfo_t) ); + if (global_proxy) + { + if (info->dwAccessType == INTERNET_OPEN_TYPE_PROXY) + { + global_proxy->proxyEnabled = 1; + global_proxy->proxy = heap_strdupW( info->lpszProxy ); + global_proxy->proxyBypass = heap_strdupW( info->lpszProxyBypass ); + } + else + { + global_proxy->proxyEnabled = 0; + global_proxy->proxy = global_proxy->proxyBypass = NULL; + } + } + LeaveCriticalSection( &WININET_cs ); + } + else + { + /* In general, each type of object should handle + * INTERNET_OPTION_PROXY directly. This FIXME ensures it doesn't + * get silently dropped. + */ + FIXME("INTERNET_OPTION_PROXY unimplemented\n"); + SetLastError(ERROR_INTERNET_INVALID_OPTION); + ret = FALSE; + } + break; + } case INTERNET_OPTION_CODEPAGE: { ULONG codepage = *(ULONG *)lpBuffer;

1 0