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

Ge van Geldorp : urlmon/tests: Fix ftp protocol test on WinXP and higher.
by Alexandre Julliard March 30, 2009

March 30, 2009

Module: wine Branch: master Commit: 6d238a6f5178fd470fd04a5a0f09bb1636de0ea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d238a6f5178fd470fd04a5a0… Author: Ge van Geldorp <ge(a)gse.nl> Date: Mon Mar 30 00:41:54 2009 +0200 urlmon/tests: Fix ftp protocol test on WinXP and higher. --- dlls/urlmon/tests/protocol.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 9a488c0..c87c7fb 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -352,7 +352,10 @@ static HRESULT WINAPI ProtocolSink_Switch(IInternetProtocolSink *iface, PROTOCOL { HRESULT hres; - CHECK_EXPECT(Switch); + if(tested_protocol == FTP_TEST) + CHECK_EXPECT2(Switch); + else + CHECK_EXPECT(Switch); ok(pProtocolData != NULL, "pProtocolData == NULL\n"); pdata = pProtocolData; @@ -1835,23 +1838,19 @@ static void test_ftp_protocol(void) (hres == S_OK && cb==1), "Read failed: %08x (%d bytes)\n", hres, cb); WaitForSingleObject(event_complete, INFINITE); - CHECK_CALLED(Switch); while(1) { - SET_EXPECT(Switch); hres = IInternetProtocol_Read(async_protocol, buf, sizeof(buf), &cb); - if(hres == E_PENDING) { + if(hres == E_PENDING) WaitForSingleObject(event_complete, INFINITE); - CHECK_CALLED(Switch); - }else { - CHECK_NOT_CALLED(Switch); + else if(cb == 0) break; - } } ok(hres == S_FALSE, "Read failed: %08x\n", hres); CHECK_CALLED(ReportResult); + CHECK_CALLED(Switch); test_protocol_terminate(async_protocol);

1 0

Roderick Colenbrander : wined3d: Check for the presence of wglGetExtensionsStringARB.
by Alexandre Julliard March 30, 2009

March 30, 2009

Module: wine Branch: master Commit: 5d08f3b7051c5b09eedff2ca4365faccc02ce8b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d08f3b7051c5b09eedff2ca4… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Mar 29 22:08:42 2009 +0200 wined3d: Check for the presence of wglGetExtensionsStringARB. --- dlls/wined3d/directx.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index aee4efe..3294fff 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1405,12 +1405,14 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { /* Make sure there's an active HDC else the WGL extensions will fail */ hdc = pwglGetCurrentDC(); if (hdc) { - WGL_Extensions = GL_EXTCALL(wglGetExtensionsStringARB(hdc)); - TRACE_(d3d_caps)("WGL_Extensions reported:\n"); + /* Not all GL drivers might offer WGL extensions e.g. VirtualBox */ + if(GL_EXTCALL(wglGetExtensionsStringARB)) + WGL_Extensions = GL_EXTCALL(wglGetExtensionsStringARB(hdc)); if (NULL == WGL_Extensions) { ERR(" WGL_Extensions returns NULL\n"); } else { + TRACE_(d3d_caps)("WGL_Extensions reported:\n"); while (*WGL_Extensions != 0x00) { const char *Start; char ThisExtn[256];

1 0

Jacek Caban : urlmon: Added IWinInetHttpInfo stub implementation to HttpProtocol object.
by Alexandre Julliard March 30, 2009

March 30, 2009

Module: wine Branch: master Commit: 3fa595e2a85b1160f4a8a2c4a10459099f684313 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fa595e2a85b1160f4a8a2c4a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 29 21:30:29 2009 +0200 urlmon: Added IWinInetHttpInfo stub implementation to HttpProtocol object. --- dlls/urlmon/http.c | 59 ++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/tests/protocol.c | 14 ++++++++++ 2 files changed, 71 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 80eefbe..f3ea158 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -34,6 +34,7 @@ typedef struct { const IInternetProtocolVtbl *lpInternetProtocolVtbl; const IInternetPriorityVtbl *lpInternetPriorityVtbl; + const IWinInetHttpInfoVtbl *lpWinInetHttpInfoVtbl; BOOL https; IHttpNegotiate *http_negotiate; @@ -42,8 +43,9 @@ typedef struct { LONG ref; } HttpProtocol; -#define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) -#define PRIORITY(x) ((IInternetPriority*) &(x)->lpInternetPriorityVtbl) +#define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) +#define PRIORITY(x) ((IInternetPriority*) &(x)->lpInternetPriorityVtbl) +#define INETHTTPINFO(x) ((IWinInetHttpInfo*) &(x)->lpWinInetHttpInfoVtbl) /* Default headers from native */ static const WCHAR wszHeaders[] = {'A','c','c','e','p','t','-','E','n','c','o','d','i','n','g', @@ -326,6 +328,12 @@ static HRESULT WINAPI HttpProtocol_QueryInterface(IInternetProtocol *iface, REFI }else if(IsEqualGUID(&IID_IInternetPriority, riid)) { TRACE("(%p)->(IID_IInternetPriority %p)\n", This, ppv); *ppv = PRIORITY(This); + }else if(IsEqualGUID(&IID_IWinInetInfo, riid)) { + TRACE("(%p)->(IID_IWinInetInfo %p)\n", This, ppv); + *ppv = INETHTTPINFO(This); + }else if(IsEqualGUID(&IID_IWinInetHttpInfo, riid)) { + TRACE("(%p)->(IID_IWinInetHttpInfo %p)\n", This, ppv); + *ppv = INETHTTPINFO(This); } if(*ppv) { @@ -527,6 +535,52 @@ static const IInternetPriorityVtbl HttpPriorityVtbl = { HttpPriority_GetPriority }; +#define INETINFO_THIS(iface) DEFINE_THIS(HttpProtocol, WinInetHttpInfo, iface) + +static HRESULT WINAPI HttpInfo_QueryInterface(IWinInetHttpInfo *iface, REFIID riid, void **ppv) +{ + HttpProtocol *This = INETINFO_THIS(iface); + return IBinding_QueryInterface(PROTOCOL(This), riid, ppv); +} + +static ULONG WINAPI HttpInfo_AddRef(IWinInetHttpInfo *iface) +{ + HttpProtocol *This = INETINFO_THIS(iface); + return IBinding_AddRef(PROTOCOL(This)); +} + +static ULONG WINAPI HttpInfo_Release(IWinInetHttpInfo *iface) +{ + HttpProtocol *This = INETINFO_THIS(iface); + return IBinding_Release(PROTOCOL(This)); +} + +static HRESULT WINAPI HttpInfo_QueryOption(IWinInetHttpInfo *iface, DWORD dwOption, + void *pBuffer, DWORD *pcbBuffer) +{ + HttpProtocol *This = INETINFO_THIS(iface); + FIXME("(%p)->(%x %p %p)\n", This, dwOption, pBuffer, pcbBuffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI HttpInfo_QueryInfo(IWinInetHttpInfo *iface, DWORD dwOption, + void *pBuffer, DWORD *pcbBuffer, DWORD *pdwFlags, DWORD *pdwReserved) +{ + HttpProtocol *This = INETINFO_THIS(iface); + FIXME("(%p)->(%x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); + return E_NOTIMPL; +} + +#undef INETINFO_THIS + +static const IWinInetHttpInfoVtbl WinInetHttpInfoVtbl = { + HttpInfo_QueryInterface, + HttpInfo_AddRef, + HttpInfo_Release, + HttpInfo_QueryOption, + HttpInfo_QueryInfo +}; + static HRESULT create_http_protocol(BOOL https, void **ppobj) { HttpProtocol *ret; @@ -538,6 +592,7 @@ static HRESULT create_http_protocol(BOOL https, void **ppobj) ret->base.vtbl = &AsyncProtocolVtbl; ret->lpInternetProtocolVtbl = &HttpProtocolVtbl; ret->lpInternetPriorityVtbl = &HttpPriorityVtbl; + ret->lpWinInetHttpInfoVtbl = &WinInetHttpInfoVtbl; ret->https = https; ret->ref = 1; diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 6044c31..d37e152 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -1610,6 +1610,19 @@ static void test_protocol_terminate(IInternetProtocol *protocol) ok(hres == S_OK, "UnlockRequest failed: %08x\n", hres); } +static void test_http_info(IInternetProtocol *protocol) +{ + IWinInetHttpInfo *info; + HRESULT hres; + + hres = IInternetProtocol_QueryInterface(protocol, &IID_IWinInetHttpInfo, (void**)&info); + ok(hres == S_OK, "Could not get IWinInterHttpInfo iface: %08x\n", hres); + + /* TODO */ + + IWinInetHttpInfo_Release(info); +} + /* is_first refers to whether this is the first call to this function * _for this url_ */ static void test_http_protocol_url(LPCWSTR url, BOOL is_https, BOOL is_first) @@ -1648,6 +1661,7 @@ static void test_http_protocol_url(LPCWSTR url, BOOL is_https, BOOL is_first) ULONG ref; test_priority(async_protocol); + test_http_info(async_protocol); SET_EXPECT(ReportProgress_FINDINGRESOURCE); SET_EXPECT(ReportProgress_CONNECTING);

1 0

Detlef Riekenberg : msi/tests: Verify path names case insensitively.
by Alexandre Julliard March 30, 2009

March 30, 2009

Module: wine Branch: master Commit: 36dbb69b66989831d30a12340ce43edfbeaee561 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36dbb69b66989831d30a12340… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Mar 29 15:31:56 2009 +0200 msi/tests: Verify path names case insensitively. --- dlls/msi/tests/install.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index a844395..6dbcf31 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3228,7 +3228,7 @@ static void test_publish_processcomponents(void) lstrcpyA(program_files_maximus,PROG_FILES_DIR); lstrcatA(program_files_maximus,"\\msitest\\maximus"); - ok(!lstrcmpA(val, program_files_maximus), + ok(!lstrcmpiA(val, program_files_maximus), "Expected \"%s\", got \"%s\"\n", program_files_maximus, val); res = RegOpenKeyA(HKEY_LOCAL_MACHINE, compkey, &hkey); @@ -3272,7 +3272,7 @@ static void test_publish_processcomponents(void) res = RegQueryValueExA(comp, "84A88FD7F6998CE40A22FB59F6B9C2BB", NULL, NULL, (LPBYTE)val, &size); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(!lstrcmpA(val, program_files_maximus), + ok(!lstrcmpiA(val, program_files_maximus), "Expected \"%s\", got \"%s\"\n", program_files_maximus, val); res = RegOpenKeyA(HKEY_LOCAL_MACHINE, compkey, &hkey);

1 0

Nikolay Sivov : comctl32/tab: Remove direct access to items array.
by Alexandre Julliard March 30, 2009

March 30, 2009

Module: wine Branch: master Commit: 48e7428964f93c65c25a815fc77a40721dd07d73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48e7428964f93c65c25a815fc… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Mar 28 09:54:37 2009 -0400 comctl32/tab: Remove direct access to items array. --- dlls/comctl32/tab.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 62770aa..2e5dced 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -252,8 +252,8 @@ 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; + TAB_GetItem(infoPtr, prevItem)->dwState &= ~TCIS_BUTTONPRESSED; + TAB_GetItem(infoPtr, iItem)->dwState |= TCIS_BUTTONPRESSED; infoPtr->iSelected=iItem; infoPtr->uFocus=iItem; @@ -1956,7 +1956,7 @@ static void TAB_DrawItem(const TAB_INFO *infoPtr, HDC hdc, INT iItem) } else /* ! selected */ { - DWORD state = infoPtr->items[iItem].dwState; + DWORD state = TAB_GetItem(infoPtr, iItem)->dwState; if (state & TCIS_BUTTONPRESSED) DrawEdge(hdc, &r, EDGE_SUNKEN, BF_SOFT|BF_RECT); @@ -3113,7 +3113,7 @@ static LRESULT TAB_RemoveImage (TAB_INFO *infoPtr, INT image) /* shift indices, repaint items if needed */ for (i = 0; i < infoPtr->uNumItem; i++) { - idx = &infoPtr->items[i].iImage; + idx = &TAB_GetItem(infoPtr, i)->iImage; if (*idx >= image) { if (*idx == image)

1 0

Nikolay Sivov : comctl32/tab: Implemented TCS_MULTISELECT for mouse selection.
by Alexandre Julliard March 30, 2009

March 30, 2009

Module: wine Branch: master Commit: 4b2ea6f4e2517fb8b7fc120874a8dd322f08de1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b2ea6f4e2517fb8b7fc12087… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Mar 28 10:20:51 2009 -0400 comctl32/tab: Implemented TCS_MULTISELECT for mouse selection. --- dlls/comctl32/tab.c | 42 +++++++++++++++++++++++++++++++++++------- 1 files changed, 35 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 1354054..86f9e12 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -32,7 +32,7 @@ * TODO: * * Styles: - * TCS_MULTISELECT + * TCS_MULTISELECT - implement for VK_SPACE selection * TCS_RIGHT * TCS_RIGHTJUSTIFY * TCS_SCROLLOPPOSITE @@ -42,9 +42,6 @@ * Extended Styles: * TCS_EX_REGISTERDROP * - * States: - * TCIS_BUTTONPRESSED - * * Notifications: * NM_RELEASEDCAPTURE * TCN_FOCUSCHANGE @@ -162,6 +159,7 @@ static const WCHAR themeClass[] = { 'T','a','b',0 }; static void TAB_InvalidateTabArea(const TAB_INFO *); static void TAB_EnsureSelectionVisible(TAB_INFO *); static void TAB_DrawItemInterior(const TAB_INFO *, HDC, INT, RECT*); +static LRESULT TAB_DeselectAll(TAB_INFO *, BOOL); static BOOL TAB_SendSimpleNotify (const TAB_INFO *infoPtr, UINT code) @@ -587,6 +585,7 @@ TAB_LButtonDown (TAB_INFO *infoPtr, WPARAM wParam, LPARAM lParam) POINT pt; INT newItem; UINT dummy; + LONG lStyle = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); if (infoPtr->hwndToolTip) TAB_RelayEvent (infoPtr->hwndToolTip, infoPtr->hwnd, @@ -607,14 +606,43 @@ TAB_LButtonDown (TAB_INFO *infoPtr, WPARAM wParam, LPARAM lParam) TRACE("On Tab, item %d\n", newItem); - if (newItem != -1 && infoPtr->iSelected != newItem) + if ((newItem != -1) && (infoPtr->iSelected != newItem)) { - if (!TAB_SendSimpleNotify(infoPtr, TCN_SELCHANGING)) + if ((lStyle & TCS_BUTTONS) && (lStyle & TCS_MULTISELECT) && + (wParam & MK_CONTROL)) { - TAB_SetCurSel(infoPtr, newItem); + RECT r; + + /* toggle multiselection */ + TAB_GetItem(infoPtr, newItem)->dwState ^= TCIS_BUTTONPRESSED; + if (TAB_InternalGetItemRect (infoPtr, newItem, &r, NULL)) + InvalidateRect (infoPtr->hwnd, &r, TRUE); + } + else + { + INT i; + BOOL pressed = FALSE; + + /* any button pressed ? */ + for (i = 0; i < infoPtr->uNumItem; i++) + if ((TAB_GetItem (infoPtr, i)->dwState & TCIS_BUTTONPRESSED) && + (infoPtr->iSelected != i)) + { + pressed = TRUE; + break; + } + + TAB_SendSimpleNotify(infoPtr, TCN_SELCHANGING); + + if (pressed) + TAB_DeselectAll (infoPtr, FALSE); + else + TAB_SetCurSel(infoPtr, newItem); + TAB_SendSimpleNotify(infoPtr, TCN_SELCHANGE); } } + return 0; }

1 0

Nikolay Sivov : comctl32/tab: Implemented TCM_DESELECTALL.
by Alexandre Julliard March 30, 2009

March 30, 2009

Module: wine Branch: master Commit: e2b1604f4a77283f2d414ad25785d56466fdd577 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2b1604f4a77283f2d414ad25… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Mar 28 09:57:09 2009 -0400 comctl32/tab: Implemented TCM_DESELECTALL. --- dlls/comctl32/tab.c | 39 ++++++++++++++++++++++++++++++++++----- 1 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 2e5dced..1354054 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -51,9 +51,6 @@ * TCN_GETOBJECT * TCN_KEYDOWN * - * Messages: - * TCM_DESELECTALL - * * Macros: * TabCtrl_AdjustRect * @@ -3164,6 +3161,39 @@ TAB_GetExtendedStyle (TAB_INFO *infoPtr) return infoPtr->exStyle; } +static LRESULT +TAB_DeselectAll (TAB_INFO *infoPtr, BOOL excludesel) +{ + LONG style = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); + BOOL paint = FALSE; + INT i, selected = infoPtr->iSelected; + + if (!(style & TCS_BUTTONS)) + return 0; + + for (i = 0; i < infoPtr->uNumItem; i++) + { + if ((TAB_GetItem(infoPtr, i)->dwState & TCIS_BUTTONPRESSED) && + (selected != i)) + { + TAB_GetItem(infoPtr, i)->dwState &= ~TCIS_BUTTONPRESSED; + paint = TRUE; + } + } + + if (!excludesel && (selected != -1)) + { + TAB_GetItem(infoPtr, selected)->dwState &= ~TCIS_BUTTONPRESSED; + infoPtr->iSelected = -1; + paint = TRUE; + } + + if (paint) + TAB_InvalidateTabArea (infoPtr); + + return 0; +} + static LRESULT WINAPI TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -3257,8 +3287,7 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TAB_SetMinTabWidth(infoPtr, (INT)lParam); case TCM_DESELECTALL: - FIXME("Unimplemented msg TCM_DESELECTALL\n"); - return 0; + return TAB_DeselectAll (infoPtr, (BOOL)wParam); case TCM_GETEXTENDEDSTYLE: return TAB_GetExtendedStyle (infoPtr);

1 0

Nikolay Sivov : comctl32/tab: Fix highlighted tabs painting.
by Alexandre Julliard March 30, 2009

March 30, 2009

Module: wine Branch: master Commit: 4ebf2e4526ac718b69046bacafd6f2540badf253 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ebf2e4526ac718b69046baca… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Mar 28 10:26:15 2009 -0400 comctl32/tab: Fix highlighted tabs painting. --- dlls/comctl32/tab.c | 31 +++++++++++++++++++++++++++---- 1 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 86f9e12..1830b2d 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -1496,6 +1496,18 @@ TAB_EraseTabInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect FillRect(hdc, &rTemp, hbr); } + /* highlighting is drawn on top of previous fills */ + if (TAB_GetItem(infoPtr, iItem)->dwState & TCIS_HIGHLIGHTED) + { + if (deleteBrush) + { + DeleteObject(hbr); + deleteBrush = FALSE; + } + hbr = GetSysColorBrush(COLOR_HIGHLIGHT); + FillRect(hdc, &rTemp, hbr); + } + /* Cleanup */ if (deleteBrush) DeleteObject(hbr); } @@ -1649,10 +1661,15 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect */ oldBkMode = SetBkMode(hdc, TRANSPARENT); if (!GetWindowTheme (infoPtr->hwnd) || (lStyle & TCS_BUTTONS)) - SetTextColor(hdc, (((lStyle & TCS_HOTTRACK) && (iItem == infoPtr->iHotTracked) - && !(lStyle & TCS_FLATBUTTONS)) - | (TAB_GetItem(infoPtr, iItem)->dwState & TCIS_HIGHLIGHTED)) ? - comctl32_color.clrHighlight : comctl32_color.clrBtnText); + { + if ((lStyle & TCS_HOTTRACK) && (iItem == infoPtr->iHotTracked) && + !(lStyle & TCS_FLATBUTTONS)) + SetTextColor(hdc, comctl32_color.clrHighlight); + else if (TAB_GetItem(infoPtr, iItem)->dwState & TCIS_HIGHLIGHTED) + SetTextColor(hdc, comctl32_color.clrHighlightText); + else + SetTextColor(hdc, comctl32_color.clrBtnText); + } /* * if owner draw, tell the owner to draw @@ -2698,6 +2715,8 @@ static inline LRESULT TAB_HighlightItem (TAB_INFO *infoPtr, INT iItem, BOOL fHighlight) { LPDWORD lpState; + DWORD oldState; + RECT r; TRACE("(%p,%d,%s)\n", infoPtr, iItem, fHighlight ? "true" : "false"); @@ -2705,12 +2724,16 @@ TAB_HighlightItem (TAB_INFO *infoPtr, INT iItem, BOOL fHighlight) return FALSE; lpState = &TAB_GetItem(infoPtr, iItem)->dwState; + oldState = *lpState; if (fHighlight) *lpState |= TCIS_HIGHLIGHTED; else *lpState &= ~TCIS_HIGHLIGHTED; + if ((oldState != *lpState) && TAB_InternalGetItemRect (infoPtr, iItem, &r, NULL)) + InvalidateRect (infoPtr->hwnd, &r, TRUE); + return TRUE; }

1 0

Francois Gouget : wineesd.drv: Let the EsounD server adjust the volume.
by Alexandre Julliard March 30, 2009

March 30, 2009

Module: wine Branch: master Commit: 9e31d23e731c9e6d6eab9282f954f7a152dfefd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e31d23e731c9e6d6eab9282f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Mar 28 11:27:42 2009 +0100 wineesd.drv: Let the EsounD server adjust the volume. This simplifies our code and avoids data copying. Also, now wodGetVolume() returns the real EsounD volume, even if it has been modified by an external mixer (e.g. esdctl). --- dlls/wineesd.drv/audio.c | 222 ++++++++++++++++++---------------------------- 1 files changed, 86 insertions(+), 136 deletions(-) diff --git a/dlls/wineesd.drv/audio.c b/dlls/wineesd.drv/audio.c index d0eed60..e15b2fd 100644 --- a/dlls/wineesd.drv/audio.c +++ b/dlls/wineesd.drv/audio.c @@ -167,12 +167,8 @@ typedef struct { /* esd information */ char* stream_name; /* a unique name identifying the esd stream */ int stream_fd; /* the socket fd we get from esd when opening a stream for playing */ - - char* sound_buffer; - long buffer_size; - - DWORD volume_left; /* volume control information */ - DWORD volume_right; + int stream_id; /* the stream id (to change the volume) */ + int esd_fd; /* a socket to communicate with the sound server */ LPWAVEHDR lpQueuePtr; /* start of queued WAVEHDRs (waiting to be notified) */ LPWAVEHDR lpPlayPtr; /* start of not yet fully played buffers */ @@ -253,59 +249,6 @@ static DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc) * Low level WAVE implementation * *======================================================================*/ -/* Volume functions derived from Alsaplayer source */ -/* length is the number of 16 bit samples */ -static void volume_effect16(void *bufin, void* bufout, int length, int left, - int right, int nChannels) -{ - short *d_out = bufout; - short *d_in = bufin; - int i, v; - -/* - TRACE("length == %d, nChannels == %d\n", length, nChannels); -*/ - - if (right == -1) right = left; - - for(i = 0; i < length; i+=(nChannels)) - { - v = (int) ((*(d_in++) * left) / 100); - *(d_out++) = (v>32767) ? 32767 : ((v<-32768) ? -32768 : v); - if(nChannels == 2) - { - v = (int) ((*(d_in++) * right) / 100); - *(d_out++) = (v>32767) ? 32767 : ((v<-32768) ? -32768 : v); - } - } -} - -/* length is the number of 8 bit samples */ -static void volume_effect8(void *bufin, void* bufout, int length, int left, - int right, int nChannels) -{ - BYTE *d_out = bufout; - BYTE *d_in = bufin; - int i, v; - -/* - TRACE("length == %d, nChannels == %d\n", length, nChannels); -*/ - - if (right == -1) right = left; - - for(i = 0; i < length; i+=(nChannels)) - { - v = (BYTE) ((*(d_in++) * left) / 100); - *(d_out++) = (v>255) ? 255 : ((v<0) ? 0 : v); - if(nChannels == 2) - { - v = (BYTE) ((*(d_in++) * right) / 100); - *(d_out++) = (v>255) ? 255 : ((v<0) ? 0 : v); - } - } -} - static DWORD bytes_to_mmtime(LPMMTIME lpTime, DWORD position, WAVEFORMATPCMEX* format) { @@ -424,11 +367,8 @@ static void ESD_CloseWaveOutDevice(WINE_WAVEOUT* wwo) HeapFree(GetProcessHeap(), 0, wwo->stream_name); esd_close(wwo->stream_fd); wwo->stream_fd = -1; - - /* free up the buffer we use for volume and reset the size */ - HeapFree(GetProcessHeap(), 0, wwo->sound_buffer); - wwo->sound_buffer = NULL; - wwo->buffer_size = 0; + if (wwo->esd_fd) + esd_close(wwo->esd_fd); } /****************************************************************** @@ -847,56 +787,9 @@ static int wodPlayer_WriteMaxFrags(WINE_WAVEOUT* wwo, DWORD* bytes) TRACE("Writing wavehdr %p.%u[%u]\n", wwo->lpPlayPtr, wwo->dwPartialOffset, wwo->lpPlayPtr->dwBufferLength); - /* see if our buffer isn't large enough for the data we are writing */ - if(wwo->buffer_size < toWrite) - { - if(wwo->sound_buffer) - { - wwo->sound_buffer = HeapReAlloc(GetProcessHeap(), 0, wwo->sound_buffer, toWrite); - wwo->buffer_size = toWrite; - } - } - - /* if we don't have a buffer then get one */ - if(!wwo->sound_buffer) - { - /* allocate some memory for the buffer */ - wwo->sound_buffer = HeapAlloc(GetProcessHeap(), 0, toWrite); - wwo->buffer_size = toWrite; - } - - /* if we don't have a buffer then error out */ - if(!wwo->sound_buffer) - { - ERR("error allocating sound_buffer memory\n"); - return 0; - } - - TRACE("toWrite == %d\n", toWrite); - - /* apply volume to the bits */ - /* for single channel audio streams we only use the LEFT volume */ - if(wwo->waveFormat.Format.wBitsPerSample == 16) - { - /* apply volume to the buffer we are about to send */ - /* divide toWrite(bytes) by 2 as volume processes by 16 bits */ - volume_effect16(wwo->lpPlayPtr->lpData + wwo->dwPartialOffset, - wwo->sound_buffer, toWrite>>1, wwo->volume_left, - wwo->volume_right, wwo->waveFormat.Format.nChannels); - } else if(wwo->waveFormat.Format.wBitsPerSample == 8) - { - /* apply volume to the buffer we are about to send */ - volume_effect8(wwo->lpPlayPtr->lpData + wwo->dwPartialOffset, - wwo->sound_buffer, toWrite, wwo->volume_left, - wwo->volume_right, wwo->waveFormat.Format.nChannels); - } else - { - FIXME("unsupported wwo->format.wBitsPerSample of %d\n", - wwo->waveFormat.Format.wBitsPerSample); - } - /* send the audio data to esd for playing */ - written = write(wwo->stream_fd, wwo->sound_buffer, toWrite); + TRACE("toWrite == %d\n", toWrite); + written = write(wwo->stream_fd, wwo->lpPlayPtr->lpData + wwo->dwPartialOffset, toWrite); TRACE("written = %d\n", written); @@ -1293,21 +1186,15 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) wwo->stream_fd = esd_play_stream(out_format, out_rate, NULL, wwo->stream_name); TRACE("wwo->stream_fd=%d\n", wwo->stream_fd); if(wwo->stream_fd < 0) return MMSYSERR_ALLOCATED; - wwo->stream_name = get_stream_name("out", wDevID); - - /* clear these so we don't have any confusion ;-) */ - wwo->sound_buffer = 0; - wwo->buffer_size = 0; + wwo->stream_name = get_stream_name("out", wDevID); + wwo->stream_id = 0; + wwo->esd_fd = -1; wwo->dwPlayedTotal = 0; wwo->dwWrittenTotal = 0; wwo->dwSleepTime = (1024 * 1000 * BUFFER_REFILL_THRESHOLD) / wwo->waveFormat.Format.nAvgBytesPerSec; - /* Initialize volume to full level */ - wwo->volume_left = 100; - wwo->volume_right = 100; - ESD_InitRingMessage(&wwo->msgRing); /* create player thread */ @@ -1502,22 +1389,70 @@ static DWORD wodBreakLoop(WORD wDevID) return MMSYSERR_NOERROR; } +static esd_player_info_t* wod_get_player(WINE_WAVEOUT* wwo, esd_info_t** esd_all_info) +{ + esd_player_info_t* player; + + if (wwo->esd_fd == -1) + { + wwo->esd_fd = esd_open_sound(NULL); + if (wwo->esd_fd < 0) + { + WARN("esd_open_sound() failed (%d)\n", errno); + return NULL; + } + } + + *esd_all_info = esd_get_all_info(wwo->esd_fd); + if (!*esd_all_info) + { + WARN("esd_get_all_info() failed (%d)\n", errno); + return NULL; + } + + for (player = (*esd_all_info)->player_list; player != NULL; player = player->next) + { + if (strcmp(player->name, wwo->stream_name) == 0) + { + wwo->stream_id = player->source_id; + return player; + } + } + + return NULL; +} + /************************************************************************** * wodGetVolume [internal] */ static DWORD wodGetVolume(WORD wDevID, LPDWORD lpdwVol) { - DWORD left, right; - - left = WOutDev[wDevID].volume_left; - right = WOutDev[wDevID].volume_right; + esd_info_t* esd_all_info; + esd_player_info_t* player; + DWORD ret; - TRACE("(%u, %p);\n", wDevID, lpdwVol); + if (wDevID >= MAX_WAVEOUTDRV || WOutDev[wDevID].stream_fd == -1) + { + WARN("bad device ID !\n"); + return MMSYSERR_BADDEVICEID; + } - *lpdwVol = ((left * 0xFFFFl) / 100) + (((right * 0xFFFFl) / 100) << - 16); + ret = MMSYSERR_ERROR; + player = wod_get_player(WOutDev+wDevID, &esd_all_info); + if (player) + { + DWORD left, right; + left = (player->left_vol_scale * 0xFFFF) / ESD_VOLUME_BASE; + right = (player->right_vol_scale * 0xFFFF) / ESD_VOLUME_BASE; + TRACE("volume = %u / %u\n", left, right); + *lpdwVol = left + (right << 16); + ret = MMSYSERR_NOERROR; + } + else + ret = MMSYSERR_ERROR; - return MMSYSERR_NOERROR; + esd_free_all_info(esd_all_info); + return ret; } /************************************************************************** @@ -1525,15 +1460,30 @@ static DWORD wodGetVolume(WORD wDevID, LPDWORD lpdwVol) */ static DWORD wodSetVolume(WORD wDevID, DWORD dwParam) { - DWORD left, right; + WINE_WAVEOUT* wwo = WOutDev+wDevID; - left = (LOWORD(dwParam) * 100) / 0xFFFFl; - right = (HIWORD(dwParam) * 100) / 0xFFFFl; + if (wDevID >= MAX_WAVEOUTDRV || wwo->stream_fd == -1) + { + WARN("bad device ID !\n"); + return MMSYSERR_BADDEVICEID; + } - TRACE("(%u, %08X);\n", wDevID, dwParam); + /* stream_id is the ESD's file descriptor for our stream so it's should + * be non-zero if set. + */ + if (!wwo->stream_id) + { + esd_info_t* esd_all_info; + /* wod_get_player sets the stream_id as a side effect */ + wod_get_player(wwo, &esd_all_info); + esd_free_all_info(esd_all_info); + } + if (!wwo->stream_id) + return MMSYSERR_ERROR; - WOutDev[wDevID].volume_left = left; - WOutDev[wDevID].volume_right = right; + esd_set_stream_pan(wwo->esd_fd, wwo->stream_id, + LOWORD(dwParam) * ESD_VOLUME_BASE / 0xFFFF, + HIWORD(dwParam) * ESD_VOLUME_BASE / 0xFFFF); return MMSYSERR_NOERROR; }

1 0

Alexandre Julliard : loader: Don't bother checking for pthread.h existence, we require it anyway.
by Alexandre Julliard March 30, 2009

March 30, 2009

Module: wine Branch: master Commit: 17c09347c0e3e814698f8a6fe98b00c33d5e92cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=17c09347c0e3e814698f8a6fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 30 15:05:07 2009 +0200 loader: Don't bother checking for pthread.h existence, we require it anyway. --- dlls/ntdll/ntdll_misc.h | 4 +--- loader/main.c | 4 +--- loader/main.h | 2 -- loader/pthread.c | 45 --------------------------------------------- 4 files changed, 2 insertions(+), 53 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 56e2b2f..75e60ef 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -22,9 +22,7 @@ #include <stdarg.h> #include <signal.h> #include <sys/types.h> -#ifdef HAVE_PTHREAD_H -# include <pthread.h> -#endif +#include <pthread.h> #include "windef.h" #include "winnt.h" diff --git a/loader/main.c b/loader/main.c index 4c2cb50..c3189ec 100644 --- a/loader/main.c +++ b/loader/main.c @@ -33,9 +33,7 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif -#ifdef HAVE_PTHREAD_H -# include <pthread.h> -#endif +#include <pthread.h> #include "wine/library.h" #include "main.h" diff --git a/loader/main.h b/loader/main.h index 0c6fc84..b06423f 100644 --- a/loader/main.h +++ b/loader/main.h @@ -22,8 +22,6 @@ #ifndef __WINE_LOADER_MAIN_H #define __WINE_LOADER_MAIN_H -#include "wine/pthread.h" - struct wine_preload_info { void *addr; diff --git a/loader/pthread.c b/loader/pthread.c index e4e0831..712bd37 100644 --- a/loader/pthread.c +++ b/loader/pthread.c @@ -39,9 +39,7 @@ #include <sys/ucontext.h> #include <sys/thr.h> #endif -#ifdef HAVE_PTHREAD_H #include <pthread.h> -#endif #ifdef HAVE_PTHREAD_NP_H #include <pthread_np.h> #endif @@ -49,8 +47,6 @@ #include "wine/library.h" #include "wine/pthread.h" -#ifdef HAVE_PTHREAD_H - static int init_done; static int nb_threads = 1; @@ -223,47 +219,6 @@ static void DECLSPEC_NORETURN abort_thread( long status ) pthread_exit( (void *)status ); } -#else /* HAVE_PTHREAD_H */ - -static void init_process( const struct wine_pthread_callbacks *callbacks, size_t size ) -{ -} - -static void init_thread( struct wine_pthread_thread_info *info ) -{ -} - -static int create_thread( struct wine_pthread_thread_info *info ) -{ - return -1; -} - -static void init_current_teb( struct wine_pthread_thread_info *info ) -{ -} - -static void *get_current_teb(void) -{ - return NULL; -} - -static void DECLSPEC_NORETURN exit_thread( struct wine_pthread_thread_info *info ) -{ - abort(); -} - -static void DECLSPEC_NORETURN abort_thread( long status ) -{ - abort(); -} - -static int pthread_sigmask( int how, const sigset_t *newset, sigset_t *oldset ) -{ - return -1; -} - -#endif /* HAVE_PTHREAD_H */ - /*********************************************************************** * pthread_functions

1 0