October 2013 - Wine-Commits

Nikolay Sivov : winetest: Added a simple script to test referrer header.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

Module: tools Branch: master Commit: c4dea4a950ef0cdcb74d9b9989ad8edde0d97e9f URL: http://source.winehq.org/git/tools.git/?a=commit;h=c4dea4a950ef0cdcb74d9b99… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 17 09:48:10 2013 +0400 winetest: Added a simple script to test referrer header. --- winetest/tests/referer.php | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/winetest/tests/referer.php b/winetest/tests/referer.php new file mode 100644 index 0000000..aa9d2f1 --- /dev/null +++ b/winetest/tests/referer.php @@ -0,0 +1,6 @@ +<?php + if (strlen($_SERVER['HTTP_REFERER'])) + echo $_SERVER['HTTP_REFERER']; + else + echo "no referer set"; +?>

1 0

Piotr Caban : comctl32: Fix UDM_GETPOS behaviour on out of range values.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: e58af930ff2b54e543fceaa35148596e864be220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e58af930ff2b54e543fceaa35… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 16 16:34:51 2013 +0200 comctl32: Fix UDM_GETPOS behaviour on out of range values. --- dlls/comctl32/updown.c | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 2373031..0761774 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -482,6 +482,25 @@ static LRESULT UPDOWN_KeyPressed(UPDOWN_INFO *infoPtr, int key) return 0; } +static int UPDOWN_GetPos(UPDOWN_INFO *infoPtr, BOOL *err) +{ + BOOL succ = UPDOWN_GetBuddyInt(infoPtr); + int val = infoPtr->CurVal; + + if(!UPDOWN_InBounds(infoPtr, val)) { + if((infoPtr->MinVal < infoPtr->MaxVal && val < infoPtr->MinVal) + || (infoPtr->MinVal > infoPtr->MaxVal && val > infoPtr->MinVal)) + val = infoPtr->MinVal; + else + val = infoPtr->MaxVal; + + succ = FALSE; + } + + if(err) *err = !succ; + return val; +} + static int UPDOWN_SetPos(UPDOWN_INFO *infoPtr, int pos) { int ret = infoPtr->CurVal; @@ -1090,8 +1109,11 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L case UDM_GETPOS: { - BOOL ret = UPDOWN_GetBuddyInt (infoPtr); - return MAKELONG(infoPtr->CurVal, ret ? 0 : 1); + BOOL err; + int pos; + + pos = UPDOWN_GetPos(infoPtr, &err); + return MAKELONG(pos, err); } case UDM_SETPOS: { @@ -1119,9 +1141,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L case UDM_GETPOS32: { - BOOL ret = UPDOWN_GetBuddyInt (infoPtr); - if ((LPBOOL)lParam) *((LPBOOL)lParam) = !ret; - return infoPtr->CurVal; + return UPDOWN_GetPos(infoPtr, (BOOL*)lParam); } case UDM_SETPOS32: {

1 0

Piotr Caban : comctl32/tests: Add more updown control value tests.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: 20019a77bc43b55b8a19dd1d60b541f0d367ffe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20019a77bc43b55b8a19dd1d6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 16 16:35:01 2013 +0200 comctl32/tests: Add more updown control value tests. --- dlls/comctl32/tests/updown.c | 44 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 43 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index 24d1a6a..188e346 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -373,12 +373,14 @@ static void test_updown_pos(void) /* there's no attempt to update buddy Edit if text didn't change */ SetWindowTextA(g_edit, "50"); - updown = create_updown_control(UDS_ALIGNRIGHT | UDS_SETBUDDYINT, g_edit); + updown = create_updown_control(UDS_ALIGNRIGHT | UDS_SETBUDDYINT | UDS_ARROWKEYS, g_edit); /* test sequence only on 5.8x versions */ r = SendMessage(updown, UDM_GETPOS32, 0, 0); if (r) { + UDACCEL accel; + flush_sequences(sequences, NUM_MSG_SEQUENCES); r = SendMessage(updown, UDM_SETPOS, 0, 50); @@ -386,6 +388,46 @@ static void test_updown_pos(void) ok_sequence(sequences, EDIT_SEQ_INDEX, test_updown_pos_nochange_seq, "test updown pos, no change", FALSE); + + SendMessage(updown, UDM_SETRANGE, 0, MAKELONG(1, 40)); + r = SendMessage(updown, UDM_GETRANGE, 0, 0); + expect(1, LOWORD(r)); + expect(40, HIWORD(r)); + + accel.nSec = 0; + accel.nInc = 5; + r = SendMessage(updown, UDM_SETACCEL, 1, (LPARAM)&accel); + expect(TRUE, r); + + r = SendMessage(updown, UDM_GETPOS, 0, 0); + expect(40, LOWORD(r)); + expect(1, HIWORD(r)); + + r = SendMessage(updown, UDM_SETPOS, 0, MAKELONG(0, 0)); + expect(40, LOWORD(r)); + expect(0, HIWORD(r)); + + r = SendMessage(updown, UDM_GETPOS, 0, 0); + expect(1, LOWORD(r)); + expect(0, HIWORD(r)); + + r = SendMessage(updown, UDM_SETPOS, 0, MAKELONG(2, 0)); + expect(1, LOWORD(r)); + expect(0, HIWORD(r)); + + r = SendMessage(g_edit, WM_KEYDOWN, VK_UP, 0); + expect(0, r); + r = SendMessage(updown, UDM_GETPOS, 0, 0); + expect(1, LOWORD(r)); + expect(0, HIWORD(r)); + + r = SendMessage(updown, UDM_SETPOS, 0, MAKELONG(50, 0)); + expect(1, LOWORD(r)); + expect(0, HIWORD(r)); + + r = SendMessage(updown, UDM_GETPOS, 0, 0); + expect(40, LOWORD(r)); + expect(0, HIWORD(r)); } DestroyWindow(updown);

1 0

Qian Hong : atl90: Add a WinSxS manifest resource.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: 9a02c62d7764c73e611e9ea79551aa2480616966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a02c62d7764c73e611e9ea79… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Oct 17 01:06:04 2013 +0800 atl90: Add a WinSxS manifest resource. --- dlls/atl90/Makefile.in | 2 ++ dlls/atl90/atl90.manifest | 5 +++++ dlls/atl90/atl90.rc | 22 ++++++++++++++++++++++ 3 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/atl90/Makefile.in b/dlls/atl90/Makefile.in index 92b5d44..738b15b 100644 --- a/dlls/atl90/Makefile.in +++ b/dlls/atl90/Makefile.in @@ -4,4 +4,6 @@ EXTRADEFS = -D_ATL_VER=_ATL_VER_90 C_SRCS = atl90.c +RC_SRCS = atl90.rc + @MAKE_DLL_RULES@ diff --git a/dlls/atl90/atl90.manifest b/dlls/atl90/atl90.manifest new file mode 100644 index 0000000..45714c8 --- /dev/null +++ b/dlls/atl90/atl90.manifest @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="Microsoft.VC90.ATL" version="9.0.30729.6161" processorArchitecture="" publicKeyToken="1fc8b3b9a1e18e3b"/> + <file name="atl90.dll"/> +</assembly> diff --git a/dlls/atl90/atl90.rc b/dlls/atl90/atl90.rc new file mode 100644 index 0000000..b21e747 --- /dev/null +++ b/dlls/atl90/atl90.rc @@ -0,0 +1,22 @@ +/* + * Resource file for atl90 + * + * Copyright 2011 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* @makedep: atl90.manifest */ +WINE_MANIFEST 24 atl90.manifest

1 0

Piotr Caban : comctl32: Fix UDM_SETPOS behavior on out of range values.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: ac31df438acf325fa10ab0cc6e2683e16f81d5ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac31df438acf325fa10ab0cc6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 16 16:34:39 2013 +0200 comctl32: Fix UDM_SETPOS behavior on out of range values. --- dlls/comctl32/updown.c | 49 +++++++++++++++++++++++++++-------------------- 1 files changed, 28 insertions(+), 21 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index a42b40f..2373031 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -482,6 +482,32 @@ static LRESULT UPDOWN_KeyPressed(UPDOWN_INFO *infoPtr, int key) return 0; } +static int UPDOWN_SetPos(UPDOWN_INFO *infoPtr, int pos) +{ + int ret = infoPtr->CurVal; + + if(!UPDOWN_InBounds(infoPtr, pos)) { + if((infoPtr->MinVal < infoPtr->MaxVal && pos < infoPtr->MinVal) + || (infoPtr->MinVal > infoPtr->MaxVal && pos > infoPtr->MinVal)) + pos = infoPtr->MinVal; + else + pos = infoPtr->MaxVal; + } + + infoPtr->CurVal = pos; + UPDOWN_SetBuddyInt(infoPtr); + + if(!UPDOWN_InBounds(infoPtr, ret)) { + if((infoPtr->MinVal < infoPtr->MaxVal && ret < infoPtr->MinVal) + || (infoPtr->MinVal > infoPtr->MaxVal && ret > infoPtr->MinVal)) + ret = infoPtr->MinVal; + else + ret = infoPtr->MaxVal; + } + return ret; +} + + /*********************************************************************** * UPDOWN_SetRange * @@ -1069,17 +1095,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L } case UDM_SETPOS: { - int temp = (short)LOWORD(lParam); - - TRACE("UpDown Ctrl new value(%d), hwnd=%p\n", temp, hwnd); - if(!UPDOWN_InBounds(infoPtr, temp)) { - if(temp < infoPtr->MinVal) temp = infoPtr->MinVal; - if(temp > infoPtr->MaxVal) temp = infoPtr->MaxVal; - } - wParam = infoPtr->CurVal; - infoPtr->CurVal = temp; - UPDOWN_SetBuddyInt (infoPtr); - return wParam; /* return prev value */ + return UPDOWN_SetPos(infoPtr, (short)LOWORD(lParam)); } case UDM_GETRANGE: return MAKELONG(infoPtr->MaxVal, infoPtr->MinVal); @@ -1109,16 +1125,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L } case UDM_SETPOS32: { - int temp; - - if(!UPDOWN_InBounds(infoPtr, (int)lParam)) { - if((int)lParam < infoPtr->MinVal) lParam = infoPtr->MinVal; - if((int)lParam > infoPtr->MaxVal) lParam = infoPtr->MaxVal; - } - temp = infoPtr->CurVal; /* save prev value */ - infoPtr->CurVal = (int)lParam; /* set the new value */ - UPDOWN_SetBuddyInt (infoPtr); - return temp; /* return prev value */ + return UPDOWN_SetPos(infoPtr, (int)lParam); } case UDM_GETUNICODEFORMAT: /* we lie a bit here, we're always using Unicode internally */

1 0

Stefan Dösinger : wined3d: Update wined3d_volume_create in the spec file.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: cd3fd297f666c3ff258cb89fe6160b270306d103 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd3fd297f666c3ff258cb89fe… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 16 00:56:34 2013 +0200 wined3d: Update wined3d_volume_create in the spec file. This was missing in ac871305f8e646e0eacdae855396755e3a909637. --- dlls/wined3d/wined3d.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index f451b7a..14400fc 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -275,7 +275,7 @@ @ cdecl wined3d_vertex_declaration_get_parent(ptr) @ cdecl wined3d_vertex_declaration_incref(ptr) -@ cdecl wined3d_volume_create(ptr long long long long long long ptr ptr ptr) +@ cdecl wined3d_volume_create(ptr long long long long long long long ptr ptr ptr) @ cdecl wined3d_volume_decref(ptr) @ cdecl wined3d_volume_from_resource(ptr) @ cdecl wined3d_volume_get_parent(ptr)

1 0

Alexandre Julliard : winemac: Clear the thread data explicitly on detach.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: 6ae1e33a17af1298bb451526b1c2a66d399eff9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ae1e33a17af1298bb451526b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 16 20:48:49 2013 +0200 winemac: Clear the thread data explicitly on detach. --- dlls/winemac.drv/macdrv_main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index d27ce94..5317c8b 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -224,6 +224,8 @@ static void thread_detach(void) if (data->keyboard_layout_uchr) CFRelease(data->keyboard_layout_uchr); HeapFree(GetProcessHeap(), 0, data); + /* clear data in case we get re-entered from user32 before the thread is truly dead */ + TlsSetValue(thread_data_tls_index, NULL); } }

1 0

Alexandre Julliard : user32: Create the desktop window before enumerating monitors.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: eb5127dfd1fef6c0b8ed380ae1f7c8c6aa998769 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb5127dfd1fef6c0b8ed380ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 16 12:14:44 2013 +0200 user32: Create the desktop window before enumerating monitors. --- dlls/user32/misc.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 50bb79a..9177f56 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -351,9 +351,6 @@ HMONITOR WINAPI MonitorFromRect( LPRECT rect, DWORD flags ) { struct monitor_enum_info info; - /* make sure the desktop window exists */ - GetDesktopWindow(); - info.rect = *rect; info.max_area = 0; info.min_distance = ~0u; @@ -444,6 +441,9 @@ BOOL WINAPI GetMonitorInfoW(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo) */ BOOL WINAPI EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) { + /* make sure the desktop window exists */ + GetDesktopWindow(); + return USER_Driver->pEnumDisplayMonitors( hdc, rect, proc, lp ); }

1 0

Michael Stefaniuc : dxgi/tests: Compile with -D__WINESRC__.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: 22af120a7a3f7f4fc8fb234f4d514a37fa59afa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22af120a7a3f7f4fc8fb234f4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 16 09:46:57 2013 +0200 dxgi/tests: Compile with -D__WINESRC__. --- dlls/dxgi/tests/Makefile.in | 1 - dlls/dxgi/tests/device.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/tests/Makefile.in b/dlls/dxgi/tests/Makefile.in index 02888af..08d2db1 100644 --- a/dlls/dxgi/tests/Makefile.in +++ b/dlls/dxgi/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = dxgi.dll IMPORTS = dxgi user32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ device.c diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index d492a95..9be59db 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -308,7 +308,7 @@ static void test_createswapchain(IDXGIDevice *device) IDXGISwapChain *swapchain; DXGI_SWAP_CHAIN_DESC creation_desc, result_desc; HRESULT hr; - WNDCLASS wc = {0}; + WNDCLASSA wc = {0}; UINT i; const struct refresh_rates refresh_list[] = @@ -321,10 +321,10 @@ static void test_createswapchain(IDXGIDevice *device) }; - wc.lpfnWndProc = DefWindowProc; + wc.lpfnWndProc = DefWindowProcA; wc.lpszClassName = "dxgi_test_wc"; - RegisterClass(&wc); + RegisterClassA(&wc); creation_desc.OutputWindow = 0; creation_desc.BufferDesc.Width = 800; @@ -338,7 +338,7 @@ static void test_createswapchain(IDXGIDevice *device) creation_desc.SampleDesc.Quality = 0; creation_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; creation_desc.BufferCount = 1; - creation_desc.OutputWindow = CreateWindow("dxgi_test_wc", "dxgi_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); + creation_desc.OutputWindow = CreateWindowA("dxgi_test_wc", "dxgi_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); creation_desc.Windowed = TRUE; creation_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; creation_desc.Flags = 0;

1 0

Piotr Caban : comctl32: Set updown control value to min or max in out of range case.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: e6fce2de4ad783cf21318128f950eae2f28a6914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6fce2de4ad783cf21318128f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 16 16:34:19 2013 +0200 comctl32: Set updown control value to min or max in out of range case. --- dlls/comctl32/updown.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 390f829..a42b40f 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -150,11 +150,16 @@ static BOOL UPDOWN_OffsetVal(UPDOWN_INFO *infoPtr, int delta) (infoPtr->MaxVal < infoPtr->MinVal ? -1 : 1) * (infoPtr->MinVal - infoPtr->MaxVal) + (delta < 0 ? 1 : -1); - } else return FALSE; + } if ((infoPtr->MaxVal > infoPtr->MinVal && infoPtr->CurVal+delta > infoPtr->MaxVal) + || (infoPtr->MaxVal < infoPtr->MinVal && infoPtr->CurVal+delta < infoPtr->MaxVal)) { + delta = infoPtr->MaxVal - infoPtr->CurVal; + } else { + delta = infoPtr->MinVal - infoPtr->CurVal; + } } infoPtr->CurVal += delta; - return TRUE; + return delta != 0; } /***********************************************************************

1 0