March 2009 - Wine-Commits - list.winehq.org

Alexandre Julliard : rpcrt4: Disable HTTP support if we don' t have socketpair and related networking functions.
by Alexandre Julliard March 26, 2009

March 26, 2009

Module: wine Branch: master Commit: ce3ce9be8f085197a6a8a44b417ecef4ff9b9272 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce3ce9be8f085197a6a8a44b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 26 14:02:01 2009 +0100 rpcrt4: Disable HTTP support if we don't have socketpair and related networking functions. --- dlls/rpcrt4/rpc_transport.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 9e4186c..e308564 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1414,8 +1414,6 @@ static int rpcrt4_protseq_sock_wait_for_new_connection(RpcServerProtseq *protseq return 1; } -#endif /* HAVE_SOCKETPAIR */ - static RPC_STATUS rpcrt4_ncacn_ip_tcp_parse_top_of_tower(const unsigned char *tower_data, size_t tower_size, char **networkaddr, @@ -2364,6 +2362,7 @@ static RPC_STATUS rpcrt4_ncacn_http_parse_top_of_tower(const unsigned char *towe networkaddr, EPM_PROTOCOL_HTTP, endpoint); } +#endif /* HAVE_SOCKETPAIR */ static const struct connection_ops conn_protseq_list[] = { { "ncacn_np", @@ -2409,7 +2408,6 @@ static const struct connection_ops conn_protseq_list[] = { rpcrt4_ncacn_ip_tcp_parse_top_of_tower, NULL, }, -#endif { "ncacn_http", { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_HTTP }, rpcrt4_ncacn_http_alloc, @@ -2424,6 +2422,7 @@ static const struct connection_ops conn_protseq_list[] = { rpcrt4_ncacn_http_parse_top_of_tower, rpcrt4_ncacn_http_receive_fragment, }, +#endif };

1 0

Henri Verbeet : d3d9: Properly initialize the viewport dimensions.
by Alexandre Julliard March 26, 2009

March 26, 2009

Module: wine Branch: master Commit: 49c22d6100f811a2c3505fdd5c859a0f6c23c578 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c22d6100f811a2c3505fdd5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 26 10:43:39 2009 +0100 d3d9: Properly initialize the viewport dimensions. --- dlls/d3d9/tests/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 84b68cb..055885e 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -794,7 +794,7 @@ static void test_reset(void) ok(vp.MaxZ == 1, "D3DVIEWPORT->MaxZ = %f\n", vp.MaxZ); } vp.X = 10; - vp.X = 20; + vp.Y = 20; vp.MinZ = 2; vp.MaxZ = 3; hr = IDirect3DDevice9_SetViewport(pDevice, &vp);

1 0

Henri Verbeet : d3d9: Don't depend on specific display modes in test_reset( ).
by Alexandre Julliard March 26, 2009

March 26, 2009

Module: wine Branch: master Commit: 8a0fc70584e57f8f96eb04cad9810da0b14144f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a0fc70584e57f8f96eb04cad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 26 10:43:39 2009 +0100 d3d9: Don't depend on specific display modes in test_reset(). --- dlls/d3d9/tests/device.c | 84 ++++++++++++++++++++++++++++++--------------- 1 files changed, 56 insertions(+), 28 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 055885e..f254719 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -725,9 +725,14 @@ static void test_reset(void) IDirect3DSurface9 *surface; IDirect3DTexture9 *texture; IDirect3DVertexShader9 *shader; - BOOL support_800x600 = FALSE; - UINT i; + UINT i, adapter_mode_count; D3DLOCKED_RECT lockrect; + struct + { + UINT w; + UINT h; + } *modes = NULL; + UINT mode_count = 0; pD3d = pDirect3DCreate9( D3D_SDK_VERSION ); ok(pD3d != NULL, "Failed to create IDirect3D9 object\n"); @@ -736,23 +741,27 @@ static void test_reset(void) if (!pD3d || !hwnd) goto cleanup; IDirect3D9_GetAdapterDisplayMode( pD3d, D3DADAPTER_DEFAULT, &d3ddm ); - ZeroMemory( &d3dpp, sizeof(d3dpp) ); - d3dpp.Windowed = FALSE; - d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - d3dpp.BackBufferWidth = 800; - d3dpp.BackBufferHeight = 600; - d3dpp.BackBufferFormat = d3ddm.Format; - d3dpp.EnableAutoDepthStencil = TRUE; - d3dpp.AutoDepthStencilFormat = D3DFMT_D24S8; - - for(i = 0; i < IDirect3D9_GetAdapterModeCount(pD3d, D3DADAPTER_DEFAULT, d3ddm.Format); i++) { + adapter_mode_count = IDirect3D9_GetAdapterModeCount(pD3d, D3DADAPTER_DEFAULT, d3ddm.Format); + modes = HeapAlloc(GetProcessHeap(), 0, sizeof(*modes) * adapter_mode_count); + for(i = 0; i < adapter_mode_count; ++i) + { + int j; ZeroMemory( &d3ddm2, sizeof(d3ddm2) ); hr = IDirect3D9_EnumAdapterModes(pD3d, D3DADAPTER_DEFAULT, d3ddm.Format, i, &d3ddm2); ok(hr == D3D_OK, "IDirect3D9_EnumAdapterModes returned %#x\n", hr); - if(d3ddm2.Width == 800 && d3ddm2.Height == 600) { - support_800x600 = TRUE; + for (j = 0; j < mode_count; ++j) + { + if (modes[j].w == d3ddm2.Width && modes[j].h == d3ddm2.Height) + break; + } + if (j == mode_count) + { + modes[j].w = d3ddm2.Width; + modes[j].h = d3ddm2.Height; + ++mode_count; } + /* We use them as invalid modes */ if((d3ddm2.Width == 801 && d3ddm2.Height == 600) || (d3ddm2.Width == 32 && d3ddm2.Height == 32)) { @@ -761,11 +770,25 @@ static void test_reset(void) goto cleanup; } } - if(!support_800x600) { - skip("Mode 800x600 not supported, skipping mode tests\n"); + + if (mode_count < 2) + { + skip("Less than 2 modes supported, skipping mode tests\n"); goto cleanup; } + i = 0; + if (modes[i].w == orig_width && modes[i].h == orig_height) ++i; + + ZeroMemory( &d3dpp, sizeof(d3dpp) ); + d3dpp.Windowed = FALSE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.BackBufferWidth = modes[i].w; + d3dpp.BackBufferHeight = modes[i].h; + d3dpp.BackBufferFormat = d3ddm.Format; + d3dpp.EnableAutoDepthStencil = TRUE; + d3dpp.AutoDepthStencilFormat = D3DFMT_D24S8; + hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); @@ -779,8 +802,8 @@ static void test_reset(void) width = GetSystemMetrics(SM_CXSCREEN); height = GetSystemMetrics(SM_CYSCREEN); - ok(width == 800, "Screen width is %d\n", width); - ok(height == 600, "Screen height is %d\n", height); + ok(width == modes[i].w, "Screen width is %u, expected %u\n", width, modes[i].w); + ok(height == modes[i].h, "Screen height is %u, expected %u\n", height, modes[i].h); hr = IDirect3DDevice9_GetViewport(pDevice, &vp); ok(hr == D3D_OK, "IDirect3DDevice9_GetViewport failed with %08x\n", hr); @@ -788,11 +811,13 @@ static void test_reset(void) { ok(vp.X == 0, "D3DVIEWPORT->X = %d\n", vp.X); ok(vp.Y == 0, "D3DVIEWPORT->Y = %d\n", vp.Y); - ok(vp.Width == 800, "D3DVIEWPORT->Width = %d\n", vp.Width); - ok(vp.Height == 600, "D3DVIEWPORT->Height = %d\n", vp.Height); + ok(vp.Width == modes[i].w, "D3DVIEWPORT->Width = %u, expected %u\n", vp.Width, modes[i].w); + ok(vp.Height == modes[i].h, "D3DVIEWPORT->Height = %u, expected %u\n", vp.Height, modes[i].h); ok(vp.MinZ == 0, "D3DVIEWPORT->MinZ = %f\n", vp.MinZ); ok(vp.MaxZ == 1, "D3DVIEWPORT->MaxZ = %f\n", vp.MaxZ); } + + i = 1; vp.X = 10; vp.Y = 20; vp.MinZ = 2; @@ -803,8 +828,8 @@ static void test_reset(void) ZeroMemory( &d3dpp, sizeof(d3dpp) ); d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.Windowed = FALSE; - d3dpp.BackBufferWidth = 640; - d3dpp.BackBufferHeight = 480; + d3dpp.BackBufferWidth = modes[i].w; + d3dpp.BackBufferHeight = modes[i].h; d3dpp.BackBufferFormat = d3ddm.Format; hr = IDirect3DDevice9_Reset(pDevice, &d3dpp); ok(hr == D3D_OK, "IDirect3DDevice9_Reset failed with %08x\n", hr); @@ -818,16 +843,16 @@ static void test_reset(void) { ok(vp.X == 0, "D3DVIEWPORT->X = %d\n", vp.X); ok(vp.Y == 0, "D3DVIEWPORT->Y = %d\n", vp.Y); - ok(vp.Width == 640, "D3DVIEWPORT->Width = %d\n", vp.Width); - ok(vp.Height == 480, "D3DVIEWPORT->Height = %d\n", vp.Height); + ok(vp.Width == modes[i].w, "D3DVIEWPORT->Width = %u, expected %u\n", vp.Width, modes[i].w); + ok(vp.Height == modes[i].h, "D3DVIEWPORT->Height = %u, expected %u\n", vp.Height, modes[i].h); ok(vp.MinZ == 0, "D3DVIEWPORT->MinZ = %f\n", vp.MinZ); ok(vp.MaxZ == 1, "D3DVIEWPORT->MaxZ = %f\n", vp.MaxZ); } width = GetSystemMetrics(SM_CXSCREEN); height = GetSystemMetrics(SM_CYSCREEN); - ok(width == 640, "Screen width is %d\n", width); - ok(height == 480, "Screen height is %d\n", height); + ok(width == modes[i].w, "Screen width is %u, expected %u\n", width, modes[i].w); + ok(height == modes[i].h, "Screen height is %u, expected %u\n", height, modes[i].h); hr = IDirect3DDevice9_GetSwapChain(pDevice, 0, &pSwapchain); ok(hr == D3D_OK, "IDirect3DDevice9_GetSwapChain returned %08x\n", hr); @@ -838,8 +863,10 @@ static void test_reset(void) ok(hr == D3D_OK, "IDirect3DSwapChain9_GetPresentParameters returned %08x\n", hr); if(SUCCEEDED(hr)) { - ok(d3dpp.BackBufferWidth == 640, "Back buffer width is %d\n", d3dpp.BackBufferWidth); - ok(d3dpp.BackBufferHeight == 480, "Back buffer height is %d\n", d3dpp.BackBufferHeight); + ok(d3dpp.BackBufferWidth == modes[i].w, "Back buffer width is %u, expected %u\n", + d3dpp.BackBufferWidth, modes[i].w); + ok(d3dpp.BackBufferHeight == modes[i].h, "Back buffer height is %u, expected %u\n", + d3dpp.BackBufferHeight, modes[i].h); } IDirect3DSwapChain9_Release(pSwapchain); } @@ -1023,6 +1050,7 @@ static void test_reset(void) ok(hr == D3DERR_DEVICENOTRESET, "IDirect3DDevice9_TestCooperativeLevel after a failed reset returned %#x\n", hr); cleanup: + HeapFree(GetProcessHeap(), 0, modes); if(pD3d) IDirect3D9_Release(pD3d); if(pDevice) IDirect3D9_Release(pDevice); }

1 0

Michael Stefaniuc : msi: Remove redundant NULL check before msi_free ( Smatch).
by Alexandre Julliard March 26, 2009

March 26, 2009

Module: wine Branch: master Commit: 6fa69c3f2b667d860cb5654164417a20c8008143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fa69c3f2b667d860cb565416… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 25 23:02:37 2009 +0100 msi: Remove redundant NULL check before msi_free (Smatch). --- dlls/msi/package.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index ec8495f..82de944 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -260,7 +260,7 @@ static LPWSTR get_fusion_filename(MSIPACKAGE *package) if (!check) { - if (file) msi_free(file); + msi_free(file); return NULL; }

1 0

Aric Stewart : msctf: Implement ThreadMgr ITfSource::UnadviseSink.
by Alexandre Julliard March 26, 2009

March 26, 2009

Module: wine Branch: master Commit: 91e2f61cda8037b0f276fd3efa097a4faf24e7cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=91e2f61cda8037b0f276fd3ef… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 25 14:35:37 2009 -0500 msctf: Implement ThreadMgr ITfSource::UnadviseSink. --- dlls/msctf/threadmgr.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index b2ec069..5461425 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -372,9 +372,14 @@ static WINAPI HRESULT ThreadMgrSource_AdviseSink(ITfSource *iface, static WINAPI HRESULT ThreadMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { + ThreadMgrSink *sink = (ThreadMgrSink*)pdwCookie; ThreadMgr *This = impl_from_ITfSourceVtbl(iface); - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + TRACE("(%p) %x\n",This,pdwCookie); + + list_remove(&sink->entry); + free_sink(sink); + + return S_OK; } static const ITfSourceVtbl ThreadMgr_SourceVtbl =

1 0

Andrew Talbot : winedos: Initializations fix.
by Alexandre Julliard March 26, 2009

March 26, 2009

Module: wine Branch: master Commit: 46c8ab351af1b1897bdd6ecb96334a7bb496d7c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46c8ab351af1b1897bdd6ecb9… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Mar 25 20:49:52 2009 +0000 winedos: Initializations fix. --- dlls/winedos/int21.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winedos/int21.c b/dlls/winedos/int21.c index 0c7967f..cbce913 100644 --- a/dlls/winedos/int21.c +++ b/dlls/winedos/int21.c @@ -2182,6 +2182,7 @@ static BOOL INT21_FileAttributes( CONTEXT86 *context, else { TRACE( "SET FILE CREATION DATE AND TIME, file %s\n", fileA ); + MultiByteToWideChar(CP_OEMCP, 0, fileA, -1, fileW, MAX_PATH); handle = CreateFileW( fileW, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, @@ -2207,8 +2208,8 @@ static BOOL INT21_FileAttributes( CONTEXT86 *context, INT_BARF( context, 0x21 ); else { - TRACE( "GET FILE CREATION DATE AND TIME, handle %d\n", - BX_reg(context) ); + TRACE( "GET FILE CREATION DATE AND TIME, file %s\n", fileA ); + MultiByteToWideChar(CP_OEMCP, 0, fileA, -1, fileW, MAX_PATH); handle = CreateFileW( fileW, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,

1 0

Alexandre Julliard : configure: socketpair needs -lsocket on Solaris.
by Alexandre Julliard March 26, 2009

March 26, 2009

Module: wine Branch: master Commit: 98bec05ed7dbecf6d869f7b661b8b384cf672c52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98bec05ed7dbecf6d869f7b66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 26 11:07:28 2009 +0100 configure: socketpair needs -lsocket on Solaris. --- configure | 4 ++-- configure.ac | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index ef84565..3bf72df 100755 --- a/configure +++ b/configure @@ -18166,7 +18166,6 @@ CFLAGS="$CFLAGS $BUILTINFLAG" - for ac_func in \ _pclose \ _popen \ @@ -18220,7 +18219,6 @@ for ac_func in \ sigaltstack \ sigprocmask \ snprintf \ - socketpair \ spawnvp \ statfs \ statvfs \ @@ -18871,6 +18869,7 @@ fi + for ac_func in \ getaddrinfo \ getnameinfo \ @@ -18880,6 +18879,7 @@ for ac_func in \ getservbyport \ inet_network \ sendmsg \ + socketpair \ do as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` diff --git a/configure.ac b/configure.ac index fe40d1e..6a60c9e 100644 --- a/configure.ac +++ b/configure.ac @@ -1482,7 +1482,6 @@ AC_CHECK_FUNCS(\ sigaltstack \ sigprocmask \ snprintf \ - socketpair \ spawnvp \ statfs \ statvfs \ @@ -1536,6 +1535,7 @@ AC_CHECK_FUNCS(\ getservbyport \ inet_network \ sendmsg \ + socketpair \ ) dnl **** Check for OpenLDAP ***

1 0

Alexandre Julliard : wininet/tests: Fix another instance of changed behavior on winehq.org.
by Alexandre Julliard March 26, 2009

March 26, 2009

Module: wine Branch: master Commit: 7e22055ee1a8b51ec6f152f4b7779e2b390d0f3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e22055ee1a8b51ec6f152f4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 25 22:57:32 2009 +0100 wininet/tests: Fix another instance of changed behavior on winehq.org. --- dlls/wininet/tests/http.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 27e393b..044b96f 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -568,8 +568,8 @@ static void InternetReadFileExA_test(int flags) SET_EXPECT2(INTERNET_STATUS_REQUEST_SENT, 2); SET_EXPECT2(INTERNET_STATUS_RECEIVING_RESPONSE, 2); SET_EXPECT2(INTERNET_STATUS_RESPONSE_RECEIVED, 2); - SET_EXPECT2(INTERNET_STATUS_CLOSING_CONNECTION, 2); - SET_EXPECT2(INTERNET_STATUS_CONNECTION_CLOSED, 2); + SET_OPTIONAL2(INTERNET_STATUS_CLOSING_CONNECTION, 2); + SET_OPTIONAL2(INTERNET_STATUS_CONNECTION_CLOSED, 2); SET_EXPECT(INTERNET_STATUS_REDIRECT); SET_OPTIONAL(INTERNET_STATUS_CONNECTING_TO_SERVER); SET_OPTIONAL(INTERNET_STATUS_CONNECTED_TO_SERVER); @@ -606,8 +606,8 @@ static void InternetReadFileExA_test(int flags) CHECK_NOTIFIED2(INTERNET_STATUS_REQUEST_SENT, 2); CHECK_NOTIFIED2(INTERNET_STATUS_RECEIVING_RESPONSE, 2); CHECK_NOTIFIED2(INTERNET_STATUS_RESPONSE_RECEIVED, 2); - todo_wine CHECK_NOTIFIED2(INTERNET_STATUS_CLOSING_CONNECTION, 2); - todo_wine CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTION_CLOSED, 2); + CHECK_NOTIFIED2(INTERNET_STATUS_CLOSING_CONNECTION, 2); + CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTION_CLOSED, 2); CHECK_NOTIFIED(INTERNET_STATUS_REDIRECT); if (flags & INTERNET_FLAG_ASYNC) CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE);

1 0

Nikolay Sivov : comctl32/tab: Selected item should have TCIS_BUTTONPRESSED state.
by Alexandre Julliard March 26, 2009

March 26, 2009

Module: wine Branch: master Commit: 0e5dac618f0f3c9575864a078c3ce614035ef4fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e5dac618f0f3c9575864a078… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Mar 25 18:34:58 2009 -0400 comctl32/tab: Selected item should have TCIS_BUTTONPRESSED state. --- dlls/comctl32/tab.c | 16 +++++----------- dlls/comctl32/tests/tab.c | 10 ++++++++++ 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index ac81016..62770aa 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -252,6 +252,9 @@ static inline LRESULT TAB_SetCurSel (TAB_INFO *infoPtr, INT iItem) return -1; else { if (infoPtr->iSelected != iItem) { + infoPtr->items[prevItem].dwState &= ~TCIS_BUTTONPRESSED; + infoPtr->items[iItem].dwState |= TCIS_BUTTONPRESSED; + infoPtr->iSelected=iItem; infoPtr->uFocus=iItem; TAB_EnsureSelectionVisible(infoPtr); @@ -489,12 +492,8 @@ static LRESULT TAB_KeyUp(TAB_INFO* infoPtr, WPARAM keyCode) { if (!TAB_SendSimpleNotify(infoPtr, TCN_SELCHANGING)) { - infoPtr->iSelected = newItem; - infoPtr->uFocus = newItem; + TAB_SetCurSel(infoPtr, newItem); TAB_SendSimpleNotify(infoPtr, TCN_SELCHANGE); - - TAB_EnsureSelectionVisible(infoPtr); - TAB_InvalidateTabArea(infoPtr); } } @@ -615,13 +614,8 @@ TAB_LButtonDown (TAB_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { if (!TAB_SendSimpleNotify(infoPtr, TCN_SELCHANGING)) { - infoPtr->iSelected = newItem; - infoPtr->uFocus = newItem; + TAB_SetCurSel(infoPtr, newItem); TAB_SendSimpleNotify(infoPtr, TCN_SELCHANGE); - - TAB_EnsureSelectionVisible(infoPtr); - - TAB_InvalidateTabArea(infoPtr); } } return 0; diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 5f5e4b9..7cee79d 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -727,6 +727,7 @@ static void test_getters_setters(HWND parent_wnd, INT nTabs) { INT selectionIndex; INT focusIndex; + TCITEM tcItem; flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -756,6 +757,15 @@ static void test_getters_setters(HWND parent_wnd, INT nTabs) ok_sequence(sequences, TAB_SEQ_INDEX, getset_cur_sel_seq, "Getset curSel test sequence", FALSE); ok_sequence(sequences, PARENT_SEQ_INDEX, empty_sequence, "Getset curSel test parent sequence", FALSE); + + /* selected item should have TCIS_BUTTONPRESSED state + It doesn't depend on button state */ + memset(&tcItem, 0, sizeof(TCITEM)); + tcItem.mask = TCIF_STATE; + tcItem.dwStateMask = TCIS_BUTTONPRESSED; + selectionIndex = SendMessage(hTab, TCM_GETCURSEL, 0, 0); + SendMessage(hTab, TCM_GETITEM, selectionIndex, (LPARAM) &tcItem); + ok (tcItem.dwState & TCIS_BUTTONPRESSED, "Selected item should have TCIS_BUTTONPRESSED\n"); } /* Testing ExtendedStyle */

1 0

Huw Davies : rpcrt4: Dynamically allocate the buffer if the fixed size one isn't large enough. Don't return an inappropriate error if we fail to get the status text, it' s only used for diagnostics.
by Alexandre Julliard March 26, 2009

March 26, 2009

Module: wine Branch: master Commit: eaf4492c704da1190b3b3844e7340a275d71acbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaf4492c704da1190b3b3844e… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 19 12:23:45 2009 +0000 rpcrt4: Dynamically allocate the buffer if the fixed size one isn't large enough. Don't return an inappropriate error if we fail to get the status text, it's only used for diagnostics. --- dlls/rpcrt4/rpc_transport.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 7de6230..9e4186c 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1597,8 +1597,8 @@ static RPC_STATUS rpcrt4_http_check_response(HINTERNET hor) DWORD status_code; DWORD size; DWORD index; - WCHAR status_text[32]; - + WCHAR buf[32]; + WCHAR *status_text = buf; TRACE("\n"); index = 0; @@ -1609,11 +1609,17 @@ static RPC_STATUS rpcrt4_http_check_response(HINTERNET hor) if (status_code < 400) return RPC_S_OK; index = 0; - size = sizeof(status_text); + size = sizeof(buf); ret = HttpQueryInfoW(hor, HTTP_QUERY_STATUS_TEXT, status_text, &size, &index); - if (!ret) - return GetLastError(); - ERR("server returned: %d %s\n", status_code, debugstr_w(status_text)); + if (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + status_text = HeapAlloc(GetProcessHeap(), 0, size); + ret = HttpQueryInfoW(hor, HTTP_QUERY_STATUS_TEXT, status_text, &size, &index); + } + + ERR("server returned: %d %s\n", status_code, ret ? debugstr_w(status_text) : "<status text unavailable>"); + if(status_text != buf) HeapFree(GetProcessHeap(), 0, status_text); + if (status_code == HTTP_STATUS_DENIED) return ERROR_ACCESS_DENIED; return RPC_S_SERVER_UNAVAILABLE;

1 0