April 2009 - Wine-commits - list.winehq.org

Mikołaj Zalewski : psapi: Implement GetProcessImageNameW.
by Alexandre Julliard 07 Apr '09

07 Apr '09

Module: wine Branch: master Commit: 666c0a57ccbf28d3eb3eee8ba2b3ed90476761f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=666c0a57ccbf28d3eb3eee8ba… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Apr 6 22:32:33 2009 +0200 psapi: Implement GetProcessImageNameW. --- dlls/psapi/psapi_main.c | 7 +++- dlls/psapi/tests/psapi_main.c | 70 ++++++++++++++++++++++++++++++---------- 2 files changed, 57 insertions(+), 20 deletions(-) diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c index 72484dc..61ba8de 100644 --- a/dlls/psapi/psapi_main.c +++ b/dlls/psapi/psapi_main.c @@ -507,8 +507,11 @@ DWORD WINAPI GetProcessImageFileNameA( HANDLE process, LPSTR file, DWORD size ) */ DWORD WINAPI GetProcessImageFileNameW( HANDLE process, LPWSTR file, DWORD size ) { - FIXME("(%p, %p, %d) stub\n", process, file, size ); - return 0; + BOOL success = QueryFullProcessImageNameW(process, PROCESS_NAME_NATIVE, file, &size); + if (success) + return size; + else + return 0; } /*********************************************************************** diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 4cee7c6..6ef5b04 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -21,10 +21,17 @@ #include <stdarg.h> #include <stdio.h> -#include "wine/test.h" #include "windows.h" +#include "wine/test.h" #include "psapi.h" +#define expect_eq_d(expected, actual) \ + do { \ + int value = (actual); \ + ok((expected) == value, "Expected " #actual " to be %d (" #expected ") is %d\n", \ + (expected), value); \ + } while (0) + #define PSAPI_GET_PROC(func) \ p ## func = (void*)GetProcAddress(hpsapi, #func); \ if(!p ## func) { \ @@ -63,6 +70,7 @@ static DWORD (WINAPI *pGetModuleFileNameExA)(HANDLE, HMODULE, LPSTR, DWORD); static BOOL (WINAPI *pGetModuleInformation)(HANDLE, HMODULE, LPMODULEINFO, DWORD); static DWORD (WINAPI *pGetMappedFileNameA)(HANDLE, LPVOID, LPSTR, DWORD); static DWORD (WINAPI *pGetProcessImageFileNameA)(HANDLE, LPSTR, DWORD); +static DWORD (WINAPI *pGetProcessImageFileNameW)(HANDLE, LPWSTR, DWORD); static BOOL (WINAPI *pGetProcessMemoryInfo)(HANDLE, PPROCESS_MEMORY_COUNTERS, DWORD); static BOOL (WINAPI *pGetWsChanges)(HANDLE, PPSAPI_WS_WATCH_INFORMATION, DWORD); static BOOL (WINAPI *pInitializeProcessForWsWatch)(HANDLE); @@ -84,6 +92,8 @@ static BOOL InitFunctionPtrs(HMODULE hpsapi) /* GetProcessImageFileName is not exported on NT4 */ pGetProcessImageFileNameA = (void *)GetProcAddress(hpsapi, "GetProcessImageFileNameA"); + pGetProcessImageFileNameW = + (void *)GetProcAddress(hpsapi, "GetProcessImageFileNameW"); return TRUE; } @@ -166,6 +176,7 @@ static void test_GetProcessImageFileName(void) { HMODULE hMod = GetModuleHandle(NULL); char szImgPath[MAX_PATH], szMapPath[MAX_PATH]; + WCHAR szImgPathW[MAX_PATH]; DWORD ret; if(pGetProcessImageFileNameA == NULL) @@ -175,26 +186,49 @@ static void test_GetProcessImageFileName(void) SetLastError(0xdeadbeef); if(!pGetProcessImageFileNameA(hpQI, szImgPath, sizeof(szImgPath))) { - if(GetLastError() == ERROR_INVALID_FUNCTION) + if(GetLastError() == ERROR_INVALID_FUNCTION) { win_skip("GetProcessImageFileName not implemented\n"); - else if(GetLastError() == 0xdeadbeef) - ok(0, "failed without error code\n"); + return; + } + + if(GetLastError() == 0xdeadbeef) + todo_wine ok(0, "failed without error code\n"); else - ok(0, "failed with %d\n", GetLastError()); + todo_wine ok(0, "failed with %d\n", GetLastError()); + } - return; + todo_wine w32_err(pGetProcessImageFileNameA(NULL, szImgPath, sizeof(szImgPath)), ERROR_INVALID_HANDLE); + todo_wine w32_err(pGetProcessImageFileNameA(hpSR, szImgPath, sizeof(szImgPath)), ERROR_ACCESS_DENIED); + todo_wine w32_err(pGetProcessImageFileNameA(hpQI, szImgPath, 0), ERROR_INSUFFICIENT_BUFFER); + todo_wine + if(w32_suc(ret = pGetProcessImageFileNameA(hpQI, szImgPath, sizeof(szImgPath))) && + w32_suc(pGetMappedFileNameA(hpQV, hMod, szMapPath, sizeof(szMapPath)))) { + /* Windows returns 2*strlen-1 */ + ok(ret >= strlen(szImgPath), "szImgPath=\"%s\" ret=%d\n", szImgPath, ret); + ok(!strcmp(szImgPath, szMapPath), + "szImgPath=\"%s\" szMapPath=\"%s\"\n", szImgPath, szMapPath); } - - w32_err(pGetProcessImageFileNameA(NULL, szImgPath, sizeof(szImgPath)), ERROR_INVALID_HANDLE); - w32_err(pGetProcessImageFileNameA(hpSR, szImgPath, sizeof(szImgPath)), ERROR_ACCESS_DENIED); - w32_err(pGetProcessImageFileNameA(hpQI, szImgPath, 0), ERROR_INSUFFICIENT_BUFFER); - if(!w32_suc(ret = pGetProcessImageFileNameA(hpQI, szImgPath, sizeof(szImgPath))) || - !w32_suc(pGetMappedFileNameA(hpQV, hMod, szMapPath, sizeof(szMapPath)))) - return; - /* Windows returns 2*strlen-1 */ - ok(ret >= strlen(szImgPath), "szImgPath=\"%s\" ret=%d\n", szImgPath, ret); - ok(!strcmp(szImgPath, szMapPath), - "szImgPath=\"%s\" szMapPath=\"%s\"\n", szImgPath, szMapPath); + + w32_err(pGetProcessImageFileNameW(NULL, szImgPathW, sizeof(szImgPathW)), ERROR_INVALID_HANDLE); + /* no information about correct buffer size returned: */ + w32_err(pGetProcessImageFileNameW(hpQI, szImgPathW, 0), ERROR_INSUFFICIENT_BUFFER); + w32_err(pGetProcessImageFileNameW(hpQI, NULL, 0), ERROR_INSUFFICIENT_BUFFER); + + /* correct call */ + memset(szImgPathW, 0xff, sizeof(szImgPathW)); + ret = pGetProcessImageFileNameW(hpQI, szImgPathW, sizeof(szImgPathW)/sizeof(WCHAR)); + ok(ret > 0, "GetProcessImageFileNameW should have succeeded.\n"); + ok(szImgPathW[0] == '\\', "GetProcessImageFileNameW should have returned an NT path.\n"); + expect_eq_d(lstrlenW(szImgPathW), ret); + + /* boundary values of 'size' */ + w32_err(pGetProcessImageFileNameW(hpQI, szImgPathW, ret), ERROR_INSUFFICIENT_BUFFER); + + memset(szImgPathW, 0xff, sizeof(szImgPathW)); + ret = pGetProcessImageFileNameW(hpQI, szImgPathW, ret + 1); + ok(ret > 0, "GetProcessImageFileNameW should have succeeded.\n"); + ok(szImgPathW[0] == '\\', "GetProcessImageFileNameW should have returned an NT path.\n"); + expect_eq_d(lstrlenW(szImgPathW), ret); } static void test_GetModuleFileNameEx(void) @@ -309,7 +343,7 @@ START_TEST(psapi_main) test_GetModuleInformation(); test_GetProcessMemoryInfo(); todo_wine test_GetMappedFileName(); - todo_wine test_GetProcessImageFileName(); + test_GetProcessImageFileName(); test_GetModuleFileNameEx(); test_GetModuleBaseName(); test_ws_functions();

1 0

Nikolay Sivov : comctl32/tab: Fix hottracked button size.
by Alexandre Julliard 07 Apr '09

07 Apr '09

Module: wine Branch: master Commit: 59ae274ac30b88b0a25af9e3e403ab0a76201752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59ae274ac30b88b0a25af9e3e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Apr 6 17:10:48 2009 -0400 comctl32/tab: Fix hottracked button size. --- dlls/comctl32/tab.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index a7e925f..525d17b 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -1480,11 +1480,12 @@ TAB_EraseTabInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect { if (lStyle & TCS_FLATBUTTONS) { - FillRect(hdc, drawRect, hbr); + InflateRect(&rTemp, 2, 2); + FillRect(hdc, &rTemp, hbr); if (iItem == infoPtr->iHotTracked) { - DrawEdge(hdc, drawRect, EDGE_RAISED, BF_SOFT|BF_TOPLEFT); - DrawEdge(hdc, drawRect, EDGE_RAISED, BF_FLAT|BF_BOTTOMRIGHT); + DrawEdge(hdc, &rTemp, EDGE_RAISED, BF_SOFT|BF_TOPLEFT); + DrawEdge(hdc, &rTemp, EDGE_RAISED, BF_FLAT|BF_BOTTOMRIGHT); } } else

1 0

Nikolay Sivov : comctl32/tab: Fix filled rectangle calculation for selected button on TCS_BUTTONS.
by Alexandre Julliard 07 Apr '09

07 Apr '09

Module: wine Branch: master Commit: 5ebc7ba72d1817e39114bdb7a51415846f7765b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ebc7ba72d1817e39114bdb7a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Apr 6 17:13:51 2009 -0400 comctl32/tab: Fix filled rectangle calculation for selected button on TCS_BUTTONS. --- dlls/comctl32/tab.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 525d17b..4eebd15 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -1570,7 +1570,22 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect drawRect->left += 4; drawRect->top += 4; drawRect->right -= 4; - drawRect->bottom -= 1; + + if (lStyle & TCS_VERTICAL) + { + if (!(lStyle & TCS_BOTTOM)) drawRect->right += 1; + drawRect->bottom -= 4; + } + else + { + if (lStyle & TCS_BOTTOM) + { + drawRect->top -= 2; + drawRect->bottom -= 4; + } + else + drawRect->bottom -= 1; + } } else {

1 0

Jacek Caban : urlmon: Added DeCompMimeFilter stub implementation.
by Alexandre Julliard 07 Apr '09

07 Apr '09

Module: wine Branch: master Commit: 11a6f3539f6b3cf4ab61fbc1a64f7ea0a024a974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11a6f3539f6b3cf4ab61fbc1a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 7 00:14:26 2009 +0200 urlmon: Added DeCompMimeFilter stub implementation. --- dlls/urlmon/Makefile.in | 1 + dlls/urlmon/mimefilter.c | 192 +++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/urlmon_main.c | 5 +- dlls/urlmon/urlmon_main.h | 1 + 4 files changed, 198 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in index 825eab2..bd6a256 100644 --- a/dlls/urlmon/Makefile.in +++ b/dlls/urlmon/Makefile.in @@ -17,6 +17,7 @@ C_SRCS = \ gopher.c \ http.c \ internet.c \ + mimefilter.c \ mk.c \ protocol.c \ regsvr.c \ diff --git a/dlls/urlmon/mimefilter.c b/dlls/urlmon/mimefilter.c new file mode 100644 index 0000000..9964612 --- /dev/null +++ b/dlls/urlmon/mimefilter.c @@ -0,0 +1,192 @@ +/* + * Copyright 2009 Jacek Caban for CodeWeavers + * + * 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 + */ + +#include "urlmon_main.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(urlmon); + +typedef struct { + const IInternetProtocolVtbl *lpIInternetProtocolVtbl; + + LONG ref; +} MimeFilter; + +#define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpIInternetProtocolVtbl) + +#define PROTOCOL_THIS(iface) DEFINE_THIS(MimeFilter, IInternetProtocol, iface) + +static HRESULT WINAPI MimeFilterProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + + *ppv = NULL; + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = PROTOCOL(This); + }else if(IsEqualGUID(&IID_IInternetProtocolRoot, riid)) { + TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", This, ppv); + *ppv = PROTOCOL(This); + }else if(IsEqualGUID(&IID_IInternetProtocol, riid)) { + TRACE("(%p)->(IID_IInternetProtocol %p)\n", This, ppv); + *ppv = PROTOCOL(This); + } + + if(*ppv) { + IInternetProtocol_AddRef(iface); + return S_OK; + } + + WARN("not supported interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI MimeFilterProtocol_AddRef(IInternetProtocol *iface) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + LONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p) ref=%d\n", This, ref); + return ref; +} + +static ULONG WINAPI MimeFilterProtocol_Release(IInternetProtocol *iface) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + heap_free(This); + + URLMON_UnlockModule(); + } + + return ref; +} + +static HRESULT WINAPI MimeFilterProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, + IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo, + DWORD grfPI, HANDLE_PTR dwReserved) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink, + pOIBindInfo, grfPI, dwReserved); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterProtocol_Continue(IInternetProtocol *iface, PROTOCOLDATA *pProtocolData) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%p)\n", This, pProtocolData); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterProtocol_Abort(IInternetProtocol *iface, HRESULT hrReason, + DWORD dwOptions) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%08x %08x)\n", This, hrReason, dwOptions); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterProtocol_Terminate(IInternetProtocol *iface, DWORD dwOptions) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%08x)\n", This, dwOptions); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterProtocol_Suspend(IInternetProtocol *iface) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterProtocol_Resume(IInternetProtocol *iface) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterProtocol_Read(IInternetProtocol *iface, void *pv, + ULONG cb, ULONG *pcbRead) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGER dlibMove, + DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterProtocol_LockRequest(IInternetProtocol *iface, DWORD dwOptions) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%08x)\n", This, dwOptions); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterProtocol_UnlockRequest(IInternetProtocol *iface) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +#undef PROTOCOL_THIS + +static const IInternetProtocolVtbl MimeFilterProtocolVtbl = { + MimeFilterProtocol_QueryInterface, + MimeFilterProtocol_AddRef, + MimeFilterProtocol_Release, + MimeFilterProtocol_Start, + MimeFilterProtocol_Continue, + MimeFilterProtocol_Abort, + MimeFilterProtocol_Terminate, + MimeFilterProtocol_Suspend, + MimeFilterProtocol_Resume, + MimeFilterProtocol_Read, + MimeFilterProtocol_Seek, + MimeFilterProtocol_LockRequest, + MimeFilterProtocol_UnlockRequest +}; + +HRESULT MimeFilter_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) +{ + MimeFilter *ret; + + TRACE("(%p %p)\n", pUnkOuter, ppobj); + + URLMON_LockModule(); + + ret = heap_alloc_zero(sizeof(MimeFilter)); + + ret->lpIInternetProtocolVtbl = &MimeFilterProtocolVtbl; + ret->ref = 1; + + *ppobj = PROTOCOL(ret); + return S_OK; +} diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index ad1b07b..8561937 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -187,6 +187,8 @@ static const ClassFactory ZoneManagerCF = { &ClassFactoryVtbl, ZoneMgrImpl_Construct}; static const ClassFactory StdURLMonikerCF = { &ClassFactoryVtbl, StdURLMoniker_Construct}; +static const ClassFactory MimeFilterCF = + { &ClassFactoryVtbl, MimeFilter_Construct}; struct object_creation_info { @@ -212,7 +214,8 @@ static const struct object_creation_info object_creation[] = { &CLSID_MkProtocol, CLASSFACTORY(&MkProtocolCF), wszMk }, { &CLSID_InternetSecurityManager, CLASSFACTORY(&SecurityManagerCF), NULL }, { &CLSID_InternetZoneManager, CLASSFACTORY(&ZoneManagerCF), NULL }, - { &CLSID_StdURLMoniker, CLASSFACTORY(&StdURLMonikerCF), NULL } + { &CLSID_StdURLMoniker, CLASSFACTORY(&StdURLMonikerCF), NULL }, + { &CLSID_DeCompMimeFilter, CLASSFACTORY(&MimeFilterCF), NULL } }; static void init_session(BOOL init) diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 0d9a966..1ee2eec 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -45,6 +45,7 @@ extern HRESULT HttpSProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); extern HRESULT FtpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); extern HRESULT GopherProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); extern HRESULT MkProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); +extern HRESULT MimeFilter_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); /********************************************************************** * Dll lifetime tracking declaration for urlmon.dll

1 0

Jacek Caban : urlmon: Added IInternetProtocolSink interface stub implementation to MimeFilter object .
by Alexandre Julliard 07 Apr '09

07 Apr '09

Module: wine Branch: master Commit: c41bcd89f3d2588b186a684d6ce2174087aa5d29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c41bcd89f3d2588b186a684d6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 7 00:14:40 2009 +0200 urlmon: Added IInternetProtocolSink interface stub implementation to MimeFilter object. --- dlls/urlmon/mimefilter.c | 77 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 74 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/mimefilter.c b/dlls/urlmon/mimefilter.c index 9964612..ee6f50f 100644 --- a/dlls/urlmon/mimefilter.c +++ b/dlls/urlmon/mimefilter.c @@ -22,12 +22,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { - const IInternetProtocolVtbl *lpIInternetProtocolVtbl; + const IInternetProtocolVtbl *lpIInternetProtocolVtbl; + const IInternetProtocolSinkVtbl *lpIInternetProtocolSinkVtbl; LONG ref; } MimeFilter; -#define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpIInternetProtocolVtbl) +#define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpIInternetProtocolVtbl) +#define PROTOCOLSINK(x) ((IInternetProtocolSink*) &(x)->lpIInternetProtocolSinkVtbl) #define PROTOCOL_THIS(iface) DEFINE_THIS(MimeFilter, IInternetProtocol, iface) @@ -45,6 +47,9 @@ static HRESULT WINAPI MimeFilterProtocol_QueryInterface(IInternetProtocol *iface }else if(IsEqualGUID(&IID_IInternetProtocol, riid)) { TRACE("(%p)->(IID_IInternetProtocol %p)\n", This, ppv); *ppv = PROTOCOL(This); + }else if(IsEqualGUID(&IID_IInternetProtocolSink, riid)) { + TRACE("(%p)->(IID_IInternetProtocolSink %p)\n", This, ppv); + *ppv = PROTOCOLSINK(This); } if(*ppv) { @@ -174,6 +179,71 @@ static const IInternetProtocolVtbl MimeFilterProtocolVtbl = { MimeFilterProtocol_UnlockRequest }; +#define PROTSINK_THIS(iface) DEFINE_THIS(MimeFilter, IInternetProtocolSink, iface) + +static HRESULT WINAPI MimeFilterSink_QueryInterface(IInternetProtocolSink *iface, + REFIID riid, void **ppv) +{ + MimeFilter *This = PROTSINK_THIS(iface); + return IInternetProtocol_QueryInterface(PROTOCOL(This), riid, ppv); +} + +static ULONG WINAPI MimeFilterSink_AddRef(IInternetProtocolSink *iface) +{ + MimeFilter *This = PROTSINK_THIS(iface); + return IInternetProtocol_AddRef(PROTOCOL(This)); +} + +static ULONG WINAPI MimeFilterSink_Release(IInternetProtocolSink *iface) +{ + MimeFilter *This = PROTSINK_THIS(iface); + return IInternetProtocol_Release(PROTOCOL(This)); +} + +static HRESULT WINAPI MimeFilterSink_Switch(IInternetProtocolSink *iface, + PROTOCOLDATA *pProtocolData) +{ + MimeFilter *This = PROTSINK_THIS(iface); + FIXME("(%p)->(%p)\n", This, pProtocolData); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterSink_ReportProgress(IInternetProtocolSink *iface, + ULONG ulStatusCode, LPCWSTR szStatusText) +{ + MimeFilter *This = PROTSINK_THIS(iface); + FIXME("(%p)->(%u %s)\n", This, ulStatusCode, debugstr_w(szStatusText)); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterSink_ReportData(IInternetProtocolSink *iface, + DWORD grfBSCF, ULONG ulProgress, ULONG ulProgressMax) +{ + MimeFilter *This = PROTSINK_THIS(iface); + FIXME("(%p)->(%d %u %u)\n", This, grfBSCF, ulProgress, ulProgressMax); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterSink_ReportResult(IInternetProtocolSink *iface, + HRESULT hrResult, DWORD dwError, LPCWSTR szResult) +{ + MimeFilter *This = PROTSINK_THIS(iface); + FIXME("(%p)->(%08x %d %s)\n", This, hrResult, dwError, debugstr_w(szResult)); + return E_NOTIMPL; +} + +#undef PROTSINK_THIS + +static const IInternetProtocolSinkVtbl InternetProtocolSinkVtbl = { + MimeFilterSink_QueryInterface, + MimeFilterSink_AddRef, + MimeFilterSink_Release, + MimeFilterSink_Switch, + MimeFilterSink_ReportProgress, + MimeFilterSink_ReportData, + MimeFilterSink_ReportResult +}; + HRESULT MimeFilter_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) { MimeFilter *ret; @@ -184,7 +254,8 @@ HRESULT MimeFilter_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) ret = heap_alloc_zero(sizeof(MimeFilter)); - ret->lpIInternetProtocolVtbl = &MimeFilterProtocolVtbl; + ret->lpIInternetProtocolVtbl = &MimeFilterProtocolVtbl; + ret->lpIInternetProtocolSinkVtbl = &InternetProtocolSinkVtbl; ret->ref = 1; *ppobj = PROTOCOL(ret);

1 0

Jacek Caban : urlmon: Remove unneeded includes.
by Alexandre Julliard 07 Apr '09

07 Apr '09

Module: wine Branch: master Commit: 9988cbce0c78c489b71cfa8dfa53509e0b73aa3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9988cbce0c78c489b71cfa8df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 7 00:14:50 2009 +0200 urlmon: Remove unneeded includes. --- dlls/urlmon/umon.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index fe60c75..e6e20b9 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -20,13 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> - #include "urlmon_main.h" #include "winreg.h" -#include "winternl.h" -#include "wininet.h" #include "shlwapi.h" #include "wine/debug.h"

1 0

Ken Thomases : dbghelp/stabs: For Mach-O, line offset is relative to original function address.
by Alexandre Julliard 07 Apr '09

07 Apr '09

Module: wine Branch: master Commit: 905ab99815eff344de3a5c5dffdcf5ec83cdb45c URL: http://source.winehq.org/git/wine.git/?a=commit;h=905ab99815eff344de3a5c5df… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Apr 6 21:40:16 2009 -0500 dbghelp/stabs: For Mach-O, line offset is relative to original function address. --- dlls/dbghelp/stabs.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index b2df46a..f6199f3 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -1131,6 +1131,7 @@ struct pending_line int source_idx; int line_num; unsigned long offset; + unsigned long load_offset; }; struct pending_object @@ -1177,13 +1178,15 @@ static inline void pending_add_var(struct pending_list* pending, const char* nam } static inline void pending_add_line(struct pending_list* pending, int source_idx, - int line_num, unsigned long offset) + int line_num, unsigned long offset, + unsigned long load_offset) { pending_make_room(pending); pending->objs[pending->num].tag = PENDING_LINE; pending->objs[pending->num].u.line.source_idx = source_idx; pending->objs[pending->num].u.line.line_num = line_num; pending->objs[pending->num].u.line.offset = offset; + pending->objs[pending->num].u.line.load_offset = load_offset; pending->num++; } @@ -1203,7 +1206,7 @@ static void pending_flush(struct pending_list* pending, struct module* module, break; case PENDING_LINE: if (module->type == DMT_MACHO) - pending->objs[i].u.line.offset -= func->address; + pending->objs[i].u.line.offset -= func->address - pending->objs[i].u.line.load_offset; symt_add_func_line(module, func, pending->objs[i].u.line.source_idx, pending->objs[i].u.line.line_num, pending->objs[i].u.line.offset); break; @@ -1489,12 +1492,12 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, { unsigned long offset = stab_ptr->n_value; if (module->type == DMT_MACHO) - offset -= curr_func->address; + offset -= curr_func->address - load_offset; symt_add_func_line(module, curr_func, source_idx, stab_ptr->n_desc, offset); } else pending_add_line(&pending_func, source_idx, stab_ptr->n_desc, - stab_ptr->n_value); + stab_ptr->n_value, load_offset); break; case N_FUN: /*

1 0

Michael Stefaniuc : wordpad: Replace long with LONG.
by Alexandre Julliard 07 Apr '09

07 Apr '09

Module: wine Branch: master Commit: 645486e8c23de988b900b6d39b0406bb56fb18b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=645486e8c23de988b900b6d39… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 7 10:02:07 2009 +0200 wordpad: Replace long with LONG. --- programs/wordpad/print.c | 6 +++--- programs/wordpad/wordpad.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index 2aa642f..a62f955 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -489,7 +489,7 @@ BOOL preview_isactive(void) return preview.page != 0; } -static void add_ruler_units(HDC hdcRuler, RECT* drawRect, BOOL NewMetrics, long EditLeftmost) +static void add_ruler_units(HDC hdcRuler, RECT* drawRect, BOOL NewMetrics, LONG EditLeftmost) { static HDC hdc; @@ -564,7 +564,7 @@ static void add_ruler_units(HDC hdcRuler, RECT* drawRect, BOOL NewMetrics, long BitBlt(hdcRuler, 0, 0, drawRect->right, drawRect->bottom, hdc, 0, 0, SRCAND); } -static void paint_ruler(HWND hWnd, long EditLeftmost, BOOL NewMetrics) +static void paint_ruler(HWND hWnd, LONG EditLeftmost, BOOL NewMetrics) { PAINTSTRUCT ps; HDC hdc = BeginPaint(hWnd, &ps); @@ -603,7 +603,7 @@ static void paint_ruler(HWND hWnd, long EditLeftmost, BOOL NewMetrics) LRESULT CALLBACK ruler_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { static WNDPROC pPrevRulerProc; - static long EditLeftmost; + static LONG EditLeftmost; static BOOL NewMetrics; switch(msg) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index c74d140..a8a7fb0 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2233,7 +2233,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) case ID_EDIT_READONLY: { - long nStyle = GetWindowLong(hwndEditor, GWL_STYLE); + LONG nStyle = GetWindowLong(hwndEditor, GWL_STYLE); if (nStyle & ES_READONLY) SendMessageW(hwndEditor, EM_SETREADONLY, 0, 0); else

1 0

Ge van Geldorp : secur32: Implement GetUserNameEx(NameSamCompatible).
by Alexandre Julliard 07 Apr '09

07 Apr '09

Module: wine Branch: master Commit: dcb3e52e2dfd0d6e494164932fb2b684d463a005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcb3e52e2dfd0d6e494164932… Author: Ge van Geldorp <ge(a)gse.nl> Date: Tue Apr 7 10:53:57 2009 +0200 secur32: Implement GetUserNameEx(NameSamCompatible). --- dlls/secur32/secur32.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 93 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 2e25b15..73db395 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -32,6 +32,7 @@ #include "secext.h" #include "ntsecapi.h" #include "thunks.h" +#include "lmcons.h" #include "wine/list.h" #include "wine/debug.h" @@ -1055,15 +1056,103 @@ BOOLEAN WINAPI GetComputerObjectNameW( BOOLEAN WINAPI GetUserNameExA( EXTENDED_NAME_FORMAT NameFormat, LPSTR lpNameBuffer, PULONG nSize) { - FIXME("%d %p %p\n", NameFormat, lpNameBuffer, nSize); - return FALSE; + BOOLEAN rc; + LPWSTR bufferW = NULL; + ULONG sizeW = *nSize; + TRACE("(%d %p %p)\n", NameFormat, lpNameBuffer, nSize); + if (lpNameBuffer) { + bufferW = HeapAlloc(GetProcessHeap(), 0, sizeW * sizeof(WCHAR)); + if (bufferW == NULL) { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + } + rc = GetUserNameExW(NameFormat, bufferW, &sizeW); + if (rc) { + ULONG len = WideCharToMultiByte(CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL); + if (len <= *nSize) + { + WideCharToMultiByte(CP_ACP, 0, bufferW, -1, lpNameBuffer, *nSize, NULL, NULL); + *nSize = len - 1; + } + else + { + *nSize = len; + rc = FALSE; + SetLastError(ERROR_MORE_DATA); + } + } + else + *nSize = sizeW; + HeapFree(GetProcessHeap(), 0, bufferW); + return rc; } BOOLEAN WINAPI GetUserNameExW( EXTENDED_NAME_FORMAT NameFormat, LPWSTR lpNameBuffer, PULONG nSize) { - FIXME("%d %p %p\n", NameFormat, lpNameBuffer, nSize); - return FALSE; + BOOLEAN status; + WCHAR samname[UNLEN + 1 + MAX_COMPUTERNAME_LENGTH + 1]; + LPWSTR out; + DWORD len; + TRACE("(%d %p %p)\n", NameFormat, lpNameBuffer, nSize); + + if (NameFormat == NameUnknown) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + switch (NameFormat) + { + case NameSamCompatible: + { + /* This assumes the current user is always a local account */ + len = MAX_COMPUTERNAME_LENGTH + 1; + if (GetComputerNameW(samname, &len)) + { + out = samname + lstrlenW(samname); + *out++ = '\\'; + len = UNLEN + 1; + if (GetUserNameW(out, &len)) + { + status = (lstrlenW(samname) < *nSize); + if (status) + { + lstrcpyW(lpNameBuffer, samname); + *nSize = lstrlenW(samname); + } + else + { + SetLastError(ERROR_MORE_DATA); + *nSize = lstrlenW(samname) + 1; + } + } + else + status = FALSE; + } + else + status = FALSE; + } + break; + case NameFullyQualifiedDN: + case NameDisplay: + case NameUniqueId: + case NameCanonical: + case NameUserPrincipal: + case NameCanonicalEx: + case NameServicePrincipal: + case NameDnsDomain: + FIXME("NameFormat %d not implemented\n", NameFormat); + SetLastError(ERROR_CANT_ACCESS_DOMAIN_INFO); + status = FALSE; + break; + default: + SetLastError(ERROR_INVALID_PARAMETER); + status = FALSE; + } + + return status; } BOOLEAN WINAPI TranslateNameA(

1 0

Ge van Geldorp : secur32/tests: Add simple tests for GetUserNameExA/W().
by Alexandre Julliard 07 Apr '09

07 Apr '09

Module: wine Branch: master Commit: c98513f9c874a6978c4b3484a368f930e3560d2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c98513f9c874a6978c4b3484a… Author: Ge van Geldorp <ge(a)gse.nl> Date: Tue Apr 7 10:54:08 2009 +0200 secur32/tests: Add simple tests for GetUserNameExA/W(). --- dlls/secur32/tests/secur32.c | 86 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 86 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c index 27e07fb..6a4ae05 100644 --- a/dlls/secur32/tests/secur32.c +++ b/dlls/secur32/tests/secur32.c @@ -32,6 +32,8 @@ static HMODULE secdll; static BOOLEAN (WINAPI * pGetComputerObjectNameA)(EXTENDED_NAME_FORMAT NameFormat, LPSTR lpNameBuffer, PULONG lpnSize); static BOOLEAN (WINAPI * pGetComputerObjectNameW)(EXTENDED_NAME_FORMAT NameFormat, LPWSTR lpNameBuffer, PULONG lpnSize); +static BOOLEAN (WINAPI * pGetUserNameExA)(EXTENDED_NAME_FORMAT NameFormat, LPSTR lpNameBuffer, PULONG lpnSize); +static BOOLEAN (WINAPI * pGetUserNameExW)(EXTENDED_NAME_FORMAT NameFormat, LPWSTR lpNameBuffer, PULONG lpnSize); static PSecurityFunctionTableA (SEC_ENTRY * pInitSecurityInterfaceA)(void); static PSecurityFunctionTableW (SEC_ENTRY * pInitSecurityInterfaceW)(void); @@ -94,6 +96,82 @@ static void testGetComputerObjectNameW(void) } } +static void testGetUserNameExA(void) +{ + char name[256]; + ULONG size; + BOOLEAN rc; + int i; + + for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); i++) { + size = sizeof(name); + ZeroMemory(name, sizeof(name)); + rc = pGetUserNameExA(formats[i], name, &size); + ok(rc || ((formats[i] == NameUnknown) && + (GetLastError() == ERROR_INVALID_PARAMETER)) || + (GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO) || + (GetLastError() == ERROR_NO_SUCH_DOMAIN) || + (GetLastError() == ERROR_NO_SUCH_USER) || + (GetLastError() == ERROR_NONE_MAPPED) || + (GetLastError() == ERROR_ACCESS_DENIED), + "GetUserNameExA(%d) failed: %d\n", + formats[i], GetLastError()); + } + + size = 0; + rc = pGetUserNameExA(NameSamCompatible, NULL, &size); + ok(! rc && GetLastError() == ERROR_MORE_DATA, "Expected fail with ERROR_MORE_DATA, got %d with %u\n", rc, GetLastError()); + ok(size != 0, "Expected size to be set to required size\n"); + size = 0; + rc = pGetUserNameExA(NameSamCompatible, name, &size); + ok(! rc && GetLastError() == ERROR_MORE_DATA, "Expected fail with ERROR_MORE_DATA, got %d with %u\n", rc, GetLastError()); + ok(size != 0, "Expected size to be set to required size\n"); + size = 1; + name[0] = 0xff; + rc = pGetUserNameExA(NameSamCompatible, name, &size); + ok(! rc && GetLastError() == ERROR_MORE_DATA, "Expected fail with ERROR_MORE_DATA, got %d with %u\n", rc, GetLastError()); + ok(1 < size, "Expected size to be set to required size\n"); + ok(name[0] == (char) 0xff, "Expected unchanged buffer\n"); +} + +static void testGetUserNameExW(void) +{ + WCHAR nameW[256]; + ULONG size; + BOOLEAN rc; + int i; + + for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); i++) { + size = sizeof(nameW); + ZeroMemory(nameW, sizeof(nameW)); + rc = pGetUserNameExW(formats[i], nameW, &size); + ok(rc || ((formats[i] == NameUnknown) && + (GetLastError() == ERROR_INVALID_PARAMETER)) || + (GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO) || + (GetLastError() == ERROR_NO_SUCH_DOMAIN) || + (GetLastError() == ERROR_NO_SUCH_USER) || + (GetLastError() == ERROR_NONE_MAPPED) || + (GetLastError() == ERROR_ACCESS_DENIED), + "GetUserNameExW(%d) failed: %d\n", + formats[i], GetLastError()); + } + + size = 0; + rc = pGetUserNameExW(NameSamCompatible, NULL, &size); + ok(! rc && GetLastError() == ERROR_MORE_DATA, "Expected fail with ERROR_MORE_DATA, got %d with %u\n", rc, GetLastError()); + ok(size != 0, "Expected size to be set to required size\n"); + size = 0; + rc = pGetUserNameExW(NameSamCompatible, nameW, &size); + ok(! rc && GetLastError() == ERROR_MORE_DATA, "Expected fail with ERROR_MORE_DATA, got %d with %u\n", rc, GetLastError()); + ok(size != 0, "Expected size to be set to required size\n"); + size = 1; + nameW[0] = 0xff; + rc = pGetUserNameExW(NameSamCompatible, nameW, &size); + ok(! rc && GetLastError() == ERROR_MORE_DATA, "Expected fail with ERROR_MORE_DATA, got %d with %u\n", rc, GetLastError()); + ok(1 < size, "Expected size to be set to required size\n"); + ok(nameW[0] == (WCHAR) 0xff, "Expected unchanged buffer\n"); +} + static void test_InitSecurityInterface(void) { PSecurityFunctionTableA sftA; @@ -137,6 +215,8 @@ START_TEST(secur32) { pGetComputerObjectNameA = (PVOID)GetProcAddress(secdll, "GetComputerObjectNameA"); pGetComputerObjectNameW = (PVOID)GetProcAddress(secdll, "GetComputerObjectNameW"); + pGetUserNameExA = (PVOID)GetProcAddress(secdll, "GetUserNameExA"); + pGetUserNameExW = (PVOID)GetProcAddress(secdll, "GetUserNameExW"); pInitSecurityInterfaceA = (PVOID)GetProcAddress(secdll, "InitSecurityInterfaceA"); pInitSecurityInterfaceW = (PVOID)GetProcAddress(secdll, "InitSecurityInterfaceW"); @@ -146,6 +226,12 @@ START_TEST(secur32) if (pGetComputerObjectNameW) testGetComputerObjectNameW(); + if (pGetUserNameExA) + testGetUserNameExA(); + + if (pGetUserNameExW) + testGetUserNameExW(); + test_InitSecurityInterface(); FreeLibrary(secdll);

1 0