wine-commits March 2009

wine-commits@winehq.org

2 participants
834 discussions

Jacek Caban : urlmon: Added IWinInetHttpInfo stub implementation to FtpProtocol object.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: c31e6537fbb287ed8953849caf9ebd189188c5d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c31e6537fbb287ed8953849ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 29 21:30:50 2009 +0200 urlmon: Added IWinInetHttpInfo stub implementation to FtpProtocol object. --- dlls/urlmon/ftp.c | 59 ++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/tests/protocol.c | 1 + 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/ftp.c b/dlls/urlmon/ftp.c index dbdd7a7..75c21f2 100644 --- a/dlls/urlmon/ftp.c +++ b/dlls/urlmon/ftp.c @@ -26,12 +26,14 @@ typedef struct { const IInternetProtocolVtbl *lpInternetProtocolVtbl; const IInternetPriorityVtbl *lpInternetPriorityVtbl; + const IWinInetHttpInfoVtbl *lpWinInetHttpInfoVtbl; LONG ref; } FtpProtocol; -#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) #define ASYNCPROTOCOL_THIS(iface) DEFINE_THIS2(FtpProtocol, base, iface) @@ -97,6 +99,12 @@ static HRESULT WINAPI FtpProtocol_QueryInterface(IInternetProtocol *iface, REFII }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) { @@ -295,6 +303,52 @@ static const IInternetPriorityVtbl FtpPriorityVtbl = { FtpPriority_GetPriority }; +#define INETINFO_THIS(iface) DEFINE_THIS(FtpProtocol, WinInetHttpInfo, iface) + +static HRESULT WINAPI HttpInfo_QueryInterface(IWinInetHttpInfo *iface, REFIID riid, void **ppv) +{ + FtpProtocol *This = INETINFO_THIS(iface); + return IBinding_QueryInterface(PROTOCOL(This), riid, ppv); +} + +static ULONG WINAPI HttpInfo_AddRef(IWinInetHttpInfo *iface) +{ + FtpProtocol *This = INETINFO_THIS(iface); + return IBinding_AddRef(PROTOCOL(This)); +} + +static ULONG WINAPI HttpInfo_Release(IWinInetHttpInfo *iface) +{ + FtpProtocol *This = INETINFO_THIS(iface); + return IBinding_Release(PROTOCOL(This)); +} + +static HRESULT WINAPI HttpInfo_QueryOption(IWinInetHttpInfo *iface, DWORD dwOption, + void *pBuffer, DWORD *pcbBuffer) +{ + FtpProtocol *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) +{ + FtpProtocol *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 +}; + HRESULT FtpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) { FtpProtocol *ret; @@ -308,6 +362,7 @@ HRESULT FtpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) ret->base.vtbl = &AsyncProtocolVtbl; ret->lpInternetProtocolVtbl = &FtpProtocolVtbl; ret->lpInternetPriorityVtbl = &FtpPriorityVtbl; + ret->lpWinInetHttpInfoVtbl = &WinInetHttpInfoVtbl; ret->ref = 1; *ppobj = PROTOCOL(ret); diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index d37e152..9a488c0 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -1814,6 +1814,7 @@ static void test_ftp_protocol(void) ok(hres == S_OK, "Could not get IInternetProtocol: %08x\n", hres); test_priority(async_protocol); + test_http_info(async_protocol); SET_EXPECT(GetBindInfo); SET_EXPECT(GetBindString_USER_AGENT);

1 0

Jacek Caban : urlmon: Added IInternetPriority handling tests.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: b83fd688a2a9f076bea194e263d945556ec5a9a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b83fd688a2a9f076bea194e26… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 29 21:30:42 2009 +0200 urlmon: Added IInternetPriority handling tests. --- dlls/urlmon/tests/url.c | 80 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 76 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index a855e1b..843b38b 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -128,6 +128,7 @@ DEFINE_EXPECT(CreateInstance); DEFINE_EXPECT(Load); DEFINE_EXPECT(PutProperty_MIMETYPEPROP); DEFINE_EXPECT(PutProperty_CLASSIDPROP); +DEFINE_EXPECT(SetPriority); static const WCHAR TEST_URL_1[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/','\0'}; static const WCHAR TEST_PART_URL_1[] = {'/','t','e','s','t','/','\0'}; @@ -223,6 +224,11 @@ static const char *debugstr_guid(REFIID riid) return buf; } +static BOOL is_urlmon_protocol(int prot) +{ + return prot == FILE_TEST || prot == HTTP_TEST || prot == HTTPS_TEST || prot == FTP_TEST || prot == MK_TEST; +} + static void test_CreateURLMoniker(LPCWSTR url1, LPCWSTR url2) { HRESULT hr; @@ -244,14 +250,66 @@ static void test_create(void) test_CreateURLMoniker(TEST_URL_1, TEST_PART_URL_1); } +static HRESULT WINAPI Priority_QueryInterface(IInternetPriority *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI Priority_AddRef(IInternetPriority *iface) +{ + return 2; +} + +static ULONG WINAPI Priority_Release(IInternetPriority *iface) +{ + return 1; +} + +static HRESULT WINAPI Priority_SetPriority(IInternetPriority *iface, LONG nPriority) +{ + CHECK_EXPECT(SetPriority); + ok(!nPriority, "nPriority = %d\n", nPriority); + return S_OK; +} + +static HRESULT WINAPI Priority_GetPriority(IInternetPriority *iface, LONG *pnPriority) +{ + ok(0, "unexpected call\n"); + return S_OK; +} + +static const IInternetPriorityVtbl InternetPriorityVtbl = { + Priority_QueryInterface, + Priority_AddRef, + Priority_Release, + Priority_SetPriority, + Priority_GetPriority +}; + +static IInternetPriority InternetPriority = { &InternetPriorityVtbl }; + static HRESULT WINAPI Protocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) { + *ppv = NULL; + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IInternetProtocol, riid)) { *ppv = iface; return S_OK; } - *ppv = NULL; + if(IsEqualGUID(&IID_IInternetPriority, riid)) { + if(!is_urlmon_protocol(test_protocol)) + return E_NOINTERFACE; + + *ppv = &InternetPriority; + return S_OK; + } + + if(IsEqualGUID(&IID_IInternetProtocolEx, riid)) + return E_NOINTERFACE; /* TODO */ + + ok(0, "unexpected call %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -413,9 +471,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, if(filedwl_api) { ok(bindf == (BINDF_PULLDATA|BINDF_FROMURLMON|BINDF_NEEDFILE), "bindf=%08x\n", bindf); - }else if(tymed == TYMED_ISTREAM - && (test_protocol == FILE_TEST || test_protocol == MK_TEST - || test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST)) { + }else if(tymed == TYMED_ISTREAM && is_urlmon_protocol(test_protocol)) { ok(bindf == (BINDF_ASYNCHRONOUS|BINDF_ASYNCSTORAGE|BINDF_PULLDATA |BINDF_FROMURLMON), "bindf=%08x\n", bindf); @@ -2072,6 +2128,8 @@ static void test_BindToStorage(int protocol, BOOL emul, DWORD t) SET_EXPECT(QueryService_IInternetProtocol); SET_EXPECT(OnStartBinding); if(emulate_protocol) { + if(is_urlmon_protocol(test_protocol)) + SET_EXPECT(SetPriority); SET_EXPECT(Start); if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST) SET_EXPECT(Terminate); @@ -2143,6 +2201,8 @@ static void test_BindToStorage(int protocol, BOOL emul, DWORD t) CHECK_CALLED(QueryService_IInternetProtocol); CHECK_CALLED(OnStartBinding); if(emulate_protocol) { + if(is_urlmon_protocol(test_protocol)) + CHECK_CALLED(SetPriority); CHECK_CALLED(Start); if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST) { if(tymed == TYMED_FILE) @@ -2242,6 +2302,8 @@ static void test_BindToObject(int protocol, BOOL emul) SET_EXPECT(QueryService_IInternetProtocol); SET_EXPECT(Obj_OnStartBinding); if(emulate_protocol) { + if(is_urlmon_protocol(test_protocol)) + SET_EXPECT(SetPriority); SET_EXPECT(Start); if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST) SET_EXPECT(Terminate); @@ -2311,6 +2373,8 @@ static void test_BindToObject(int protocol, BOOL emul) CHECK_CALLED(QueryService_IInternetProtocol); CHECK_CALLED(Obj_OnStartBinding); if(emulate_protocol) { + if(is_urlmon_protocol(test_protocol)) + CHECK_CALLED(SetPriority); CHECK_CALLED(Start); if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST) CHECK_CALLED(Terminate); @@ -2391,6 +2455,8 @@ static void test_URLDownloadToFile(DWORD prot, BOOL emul) } SET_EXPECT(OnStartBinding); if(emulate_protocol) { + if(is_urlmon_protocol(test_protocol)) + SET_EXPECT(SetPriority); SET_EXPECT(Start); SET_EXPECT(UnlockRequest); }else { @@ -2425,6 +2491,8 @@ static void test_URLDownloadToFile(DWORD prot, BOOL emul) } CHECK_CALLED(OnStartBinding); if(emulate_protocol) { + if(is_urlmon_protocol(test_protocol)) + CHECK_CALLED(SetPriority); CHECK_CALLED(Start); CHECK_CALLED(UnlockRequest); }else { @@ -2524,6 +2592,8 @@ static void test_ReportResult(HRESULT exhres) SET_EXPECT(GetBindInfo); SET_EXPECT(QueryInterface_IInternetProtocol); SET_EXPECT(OnStartBinding); + if(is_urlmon_protocol(test_protocol)) + SET_EXPECT(SetPriority); SET_EXPECT(Start); hres = IMoniker_BindToStorage(mon, bctx, NULL, &IID_IStream, (void**)&unk); @@ -2536,6 +2606,8 @@ static void test_ReportResult(HRESULT exhres) CHECK_CALLED(GetBindInfo); CHECK_CALLED(QueryInterface_IInternetProtocol); CHECK_CALLED(OnStartBinding); + if(is_urlmon_protocol(test_protocol)) + CHECK_CALLED(SetPriority); CHECK_CALLED(Start); ok(unk == NULL, "unk=%p\n", unk);

1 0

Jacek Caban : urlmon: Added IWinInetHttpInfo stub implementation to HttpProtocol object.
by Alexandre Julliard 30 Mar '09

30 Mar '09

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 30 Mar '09

30 Mar '09

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: Fix highlighted tabs painting.
by Alexandre Julliard 30 Mar '09

30 Mar '09

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

Nikolay Sivov : comctl32/tab: Implemented TCS_MULTISELECT for mouse selection.
by Alexandre Julliard 30 Mar '09

30 Mar '09

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 30 Mar '09

30 Mar '09

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: Remove direct access to items array.
by Alexandre Julliard 30 Mar '09

30 Mar '09

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

Alexandre Julliard : loader: Add missing install dependency for extra binaries.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: bfeaad0d45db33f8fee0674ea72c6ffa256956a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfeaad0d45db33f8fee0674ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 30 15:05:17 2009 +0200 loader: Add missing install dependency for extra binaries. --- loader/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/loader/Makefile.in b/loader/Makefile.in index ae2f386..afe3f73 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -45,7 +45,7 @@ wine: $(MAIN_OBJS) Makefile.in wine-installed: $(MAIN_OBJS) Makefile.in $(CC) -o $@ $(LDEXECFLAGS) $(MAIN_OBJS) $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) $(LDRPATH_INSTALL) -$(EXTRA_BINARIES:%=__install__%): $(DESTDIR)$(bindir) dummy +$(EXTRA_BINARIES:%=__install__%): $(EXTRA_BINARIES) $(DESTDIR)$(bindir) dummy f=`expr $@ : '__install__$.*$'` && $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$$f .PHONY: $(EXTRA_BINARIES:%=__install__%)

1 0

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

30 Mar '09

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

← Newer
1
...
4
5
6
7
8
9
10
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2009