July 2006 - Wine-Commits - list.winehq.org

Jacek Caban : shdocvw: Added SetExtent and GetExtent implementation.
by Alexandre Julliard July 31, 2006

July 31, 2006

Module: wine Branch: refs/heads/master Commit: 3d1627f673f453e95550f66c9dff2fd9555bbd8a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3d1627f673f453e95550f66… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 31 13:22:32 2006 +0200 shdocvw: Added SetExtent and GetExtent implementation. --- dlls/shdocvw/oleobject.c | 19 +++++++++-- dlls/shdocvw/shdocvw.h | 1 + dlls/shdocvw/tests/webbrowser.c | 65 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index c50b302..cddf6bb 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -395,15 +395,23 @@ static HRESULT WINAPI OleObject_GetUserT static HRESULT WINAPI OleObject_SetExtent(IOleObject *iface, DWORD dwDrawAspect, SIZEL *psizel) { WebBrowser *This = OLEOBJ_THIS(iface); - FIXME("(%p)->(%lx %p)\n", This, dwDrawAspect, psizel); - return E_NOTIMPL; + + TRACE("(%p)->(%lx %p)\n", This, dwDrawAspect, psizel); + + /* Tests show that dwDrawAspect is ignored */ + memcpy(&This->extent, psizel, sizeof(SIZEL)); + return S_OK; } static HRESULT WINAPI OleObject_GetExtent(IOleObject *iface, DWORD dwDrawAspect, SIZEL *psizel) { WebBrowser *This = OLEOBJ_THIS(iface); - FIXME("(%p)->(%lx, %p)\n", This, dwDrawAspect, psizel); - return E_NOTIMPL; + + TRACE("(%p)->(%lx, %p)\n", This, dwDrawAspect, psizel); + + /* Tests show that dwDrawAspect is ignored */ + memcpy(psizel, &This->extent, sizeof(SIZEL)); + return S_OK; } static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *pAdvSink, @@ -808,6 +816,9 @@ void WebBrowser_OleObject_Init(WebBrowse memset(&This->pos_rect, 0, sizeof(RECT)); memset(&This->clip_rect, 0, sizeof(RECT)); memset(&This->frameinfo, 0, sizeof(OLEINPLACEFRAMEINFO)); + + This->extent.cx = 1323; + This->extent.cy = 529; } void WebBrowser_OleObject_Destroy(WebBrowser *This) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 4b07323..17ac8e7 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -119,6 +119,7 @@ typedef struct { RECT pos_rect; RECT clip_rect; OLEINPLACEFRAMEINFO frameinfo; + SIZEL extent; HWND shell_embedding_hwnd; diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index ce9cae4..2897857 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -828,6 +828,70 @@ static void test_GetControlInfo(IUnknown IOleControl_Release(control); } +static void test_Extent(IUnknown *unk) +{ + IOleObject *oleobj; + SIZE size; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); + ok(hres == S_OK, "Could not get IOleObkect: %08lx\n", hres); + if(FAILED(hres)) + return; + + size.cx = size.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &size); + ok(hres == S_OK, "GetExtent failed: %08lx\n", hres); + ok(size.cx == 1323 && size.cy == 529, "size = {%ld %ld}\n", size.cx, size.cy); + + size.cx = 800; + size.cy = 700; + hres = IOleObject_SetExtent(oleobj, DVASPECT_CONTENT, &size); + ok(hres == S_OK, "SetExtent failed: %08lx\n", hres); + + size.cx = size.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &size); + ok(hres == S_OK, "GetExtent failed: %08lx\n", hres); + ok(size.cx == 800 && size.cy == 700, "size = {%ld %ld}\n", size.cx, size.cy); + + size.cx = size.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, 0, &size); + ok(hres == S_OK, "GetExtent failed: %08lx\n", hres); + ok(size.cx == 800 && size.cy == 700, "size = {%ld %ld}\n", size.cx, size.cy); + + size.cx = 900; + size.cy = 800; + hres = IOleObject_SetExtent(oleobj, 0, &size); + ok(hres == S_OK, "SetExtent failed: %08lx\n", hres); + + size.cx = size.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, 0, &size); + ok(hres == S_OK, "GetExtent failed: %08lx\n", hres); + ok(size.cx == 900 && size.cy == 800, "size = {%ld %ld}\n", size.cx, size.cy); + + size.cx = size.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, 0xdeadbeef, &size); + ok(hres == S_OK, "GetExtent failed: %08lx\n", hres); + ok(size.cx == 900 && size.cy == 800, "size = {%ld %ld}\n", size.cx, size.cy); + + size.cx = 1000; + size.cy = 900; + hres = IOleObject_SetExtent(oleobj, 0xdeadbeef, &size); + ok(hres == S_OK, "SetExtent failed: %08lx\n", hres); + + size.cx = size.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, 0xdeadbeef, &size); + ok(hres == S_OK, "GetExtent failed: %08lx\n", hres); + ok(size.cx == 1000 && size.cy == 900, "size = {%ld %ld}\n", size.cx, size.cy); + + size.cx = size.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &size); + ok(hres == S_OK, "GetExtent failed: %08lx\n", hres); + ok(size.cx == 1000 && size.cy == 900, "size = {%ld %ld}\n", size.cx, size.cy); + + IOleObject_Release(oleobj); +} + static void test_WebBrowser(void) { IUnknown *unk = NULL; @@ -842,6 +906,7 @@ static void test_WebBrowser(void) test_ClassInfo(unk); test_ClientSite(unk, &ClientSite); + test_Extent(unk); test_DoVerb(unk); test_ClientSite(unk, NULL); test_ie_funcs(unk);

1 0

Chris Robinson : wined3d: Avoid NULL dereference.
by Alexandre Julliard July 31, 2006

July 31, 2006

Module: wine Branch: refs/heads/master Commit: 92bc96a96b702093e1ea45e64501ab1f8bad8099 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=92bc96a96b702093e1ea45e… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Mon Jul 31 06:36:11 2006 -0700 wined3d: Avoid NULL dereference. --- dlls/wined3d/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 17a9cbb..a793d23 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2405,7 +2405,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl } *pStream = This->stateBlock->streamSource[StreamNumber]; *pStride = This->stateBlock->streamStride[StreamNumber]; - *pOffset = This->stateBlock->streamOffset[StreamNumber]; + if (pOffset) { + *pOffset = This->stateBlock->streamOffset[StreamNumber]; + } if (*pStream == NULL) { FIXME("Attempting to get an empty stream %d, returning WINED3DERR_INVALIDCALL\n", StreamNumber);

1 0

Chris Robinson : wined3d: Fix potential NULL dereference in IWineD3DSurfaceImpl_LockRect.
by Alexandre Julliard July 31, 2006

July 31, 2006

Module: wine Branch: refs/heads/master Commit: 13557abb7fa2ba8173e4c6bd3b66f2881c43e7ff URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=13557abb7fa2ba8173e4c6b… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Mon Jul 31 06:36:55 2006 -0700 wined3d: Fix potential NULL dereference in IWineD3DSurfaceImpl_LockRect. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 67cd009..b11dda8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -673,7 +673,7 @@ static HRESULT WINAPI IWineD3DSurfaceImp /* NOTE: In a shared context environment the renderTarget will use the same context as the implicit swapchain (we're not in a shared environment yet! */ if ((swapchain == targetSwapChain && targetSwapChain != NULL) || iface == myDevice->renderTarget) { - if (iface == swapchain->frontBuffer) { + if (swapchain && iface == swapchain->frontBuffer) { TRACE("locking front\n"); glReadBuffer(GL_FRONT); }

1 0

Thomas Kho : riched20: Implement EM_GETLINE.
by Alexandre Julliard July 31, 2006

July 31, 2006

Module: wine Branch: refs/heads/master Commit: 3f19ffe809aa68a2936ae6a3b0df677932fd0ef7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3f19ffe809aa68a2936ae6a… Author: Thomas Kho <tkho(a)ucla.edu> Date: Mon Jul 31 07:59:43 2006 +0200 riched20: Implement EM_GETLINE. --- dlls/riched20/editor.c | 55 +++++++++++++++++++++++++++++++++++-- dlls/riched20/tests/editor.c | 63 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 0bdfcd6..390ac3b 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -52,7 +52,7 @@ - EM_GETIMESTATUS - EM_GETLANGOPTIONS 2.0 - EM_GETLIMITTEXT - - EM_GETLINE + + EM_GETLINE + EM_GETLINECOUNT returns number of rows, not of paragraphs + EM_GETMODIFY - EM_GETOLEINTERFACE @@ -1411,7 +1411,6 @@ LRESULT WINAPI RichEditANSIWndProc(HWND /* UNSUPPORTED_MSG(EM_GETIMESTATUS) missing in Wine headers */ UNSUPPORTED_MSG(EM_GETLANGOPTIONS) UNSUPPORTED_MSG(EM_GETLIMITTEXT) - UNSUPPORTED_MSG(EM_GETLINE) /* UNSUPPORTED_MSG(EM_GETOLEINTERFACE) separate stub */ UNSUPPORTED_MSG(EM_GETPASSWORDCHAR) UNSUPPORTED_MSG(EM_GETREDONAME) @@ -2036,6 +2035,58 @@ LRESULT WINAPI RichEditANSIWndProc(HWND return nChars; } } + case EM_GETLINE: + { + ME_DisplayItem *run; + const BOOL bUnicode = IsWindowUnicode(hWnd); + const unsigned int nMaxChars = *(WORD *) lParam; + unsigned int nEndChars, nCharsLeft = nMaxChars; + char *dest = (char *) lParam; + + TRACE("EM_GETLINE: row=%d, nMaxChars=%d (%s)\n", (int) wParam, nMaxChars, + bUnicode ? "Unicode" : "Ansi"); + + run = ME_FindRowWithNumber(editor, wParam); + if (run == NULL) + return 0; + + while (nCharsLeft && (run = ME_FindItemFwd(run, diRunOrStartRow)) + && !(run->member.run.nFlags & MERF_ENDPARA)) + { + unsigned int nCopy; + ME_String *strText; + if (run->type != diRun) + break; + strText = run->member.run.strText; + nCopy = min(nCharsLeft, strText->nLen); + + if (bUnicode) + lstrcpynW((LPWSTR) dest, strText->szData, nCopy); + else + nCopy = WideCharToMultiByte(CP_ACP, 0, strText->szData, nCopy, dest, + nCharsLeft, NULL, NULL); + dest += nCopy * (bUnicode ? sizeof(WCHAR) : 1); + nCharsLeft -= nCopy; + } + + /* append \r\0, space allowing */ + nEndChars = min(nCharsLeft, 2); + nCharsLeft -= nEndChars; + if (bUnicode) + { + const WCHAR src[] = {'\r', '\0'}; + lstrcpynW((LPWSTR) dest, src, nEndChars); + } + else + lstrcpynA(dest, "\r", nEndChars); + + TRACE("EM_GETLINE: got %u bytes\n", nMaxChars - nCharsLeft); + + if (nEndChars == 2) + return nMaxChars - nCharsLeft - 1; /* don't count \0 */ + else + return nMaxChars - nCharsLeft; + } case EM_GETLINECOUNT: { ME_DisplayItem *item = editor->pBuffer->pFirst->next; diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 7aa5a5f..dd4f2dd 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -189,6 +189,68 @@ static void test_EM_FINDTEXT(void) DestroyWindow(hwndRichEdit); } +static const struct getline_s { + int line; + size_t buffer_len; + const char *text; +} gl[] = { + {0, 10, "foo bar\r"}, + {1, 10, "\r"}, + {2, 10, "bar\r"}, + {3, 10, "\r"}, + + /* Buffer smaller than line length */ + {0, 2, "foo bar\r"}, + {0, 1, "foo bar\r"}, + {0, 0, "foo bar\r"} +}; + +static void test_EM_GETLINE(void) +{ + int i; + HWND hwndRichEdit = new_richedit(NULL); + static const int nBuf = 1024; + char dest[1024], origdest[1024]; + const char text[] = "foo bar\n" + "\n" + "bar\n"; + + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text); + + memset(origdest, 0xBB, nBuf); + for (i = 0; i < sizeof(gl)/sizeof(struct getline_s); i++) + { + int nCopied; + int expected_nCopied = min(gl[i].buffer_len, strlen(gl[i].text)); + int expected_bytes_written = min(gl[i].buffer_len, strlen(gl[i].text) + 1); + memset(dest, 0xBB, nBuf); + *(WORD *) dest = gl[i].buffer_len; + + /* EM_GETLINE appends a "\r\0" to the end of the line + * nCopied counts up to and including the '\r' */ + nCopied = SendMessage(hwndRichEdit, EM_GETLINE, gl[i].line, (LPARAM) dest); + ok(nCopied == expected_nCopied, "%d: %d!=%d\n", i, nCopied, + expected_nCopied); + /* two special cases since a parameter is passed via dest */ + if (gl[i].buffer_len == 0) + ok(!dest[0] && !dest[1] && !strncmp(dest+2, origdest+2, nBuf-2), + "buffer_len=0\n"); + else if (gl[i].buffer_len == 1) + ok(dest[0] == gl[i].text[0] && !dest[1] && + !strncmp(dest+2, origdest+2, nBuf-2), "buffer_len=1\n"); + else + { + ok(!strncmp(dest, gl[i].text, expected_bytes_written), + "%d: expected_bytes_written=%d\n", i, expected_bytes_written); + ok(!strncmp(dest + expected_bytes_written, origdest + + expected_bytes_written, nBuf - expected_bytes_written), + "%d: expected_bytes_written=%d\n", i, expected_bytes_written); + } + } + + DestroyWindow(hwndRichEdit); +} + static int get_scroll_pos_y(HWND hwnd) { POINT p = {-1, -1}; @@ -822,6 +884,7 @@ START_TEST( editor ) hmoduleRichEdit = LoadLibrary("RICHED20.DLL"); ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); test_EM_FINDTEXT(); + test_EM_GETLINE(); test_EM_SCROLLCARET(); test_EM_SCROLL(); test_EM_SETTEXTMODE();

1 0

Mike McCormack : ole32: Use IsGUIDEqual to compare IIDs.
by Alexandre Julliard July 31, 2006

July 31, 2006

Module: wine Branch: refs/heads/master Commit: 63cbef27a21f937ac61471c566b54d173d623cae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=63cbef27a21f937ac61471c… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Aug 1 03:10:58 2006 +0900 ole32: Use IsGUIDEqual to compare IIDs. --- dlls/ole32/storage32.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index acc41c4..fd252d8 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -199,15 +199,12 @@ static HRESULT WINAPI StorageBaseImpl_Qu /* * Compare the riid with the interface IDs implemented by this object. */ - if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) - { - *ppvObject = (IStorage*)This; - } - else if (memcmp(&IID_IStorage, riid, sizeof(IID_IStorage)) == 0) + if (IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_IStorage, riid)) { *ppvObject = (IStorage*)This; } - else if (memcmp(&IID_IPropertySetStorage, riid, sizeof(IID_IPropertySetStorage)) == 0) + else if (IsEqualGUID(&IID_IPropertySetStorage, riid)) { *ppvObject = (IStorage*)&This->pssVtbl; }

1 0

Alexandre Julliard : libwine: Better heuristic for finding the top of the address space on Linux.
by Alexandre Julliard July 31, 2006

July 31, 2006

Module: wine Branch: refs/heads/master Commit: 6a5d3600ddcacff7abcf8cbf23d2303e880006fa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6a5d3600ddcacff7abcf8cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 31 17:09:34 2006 +0200 libwine: Better heuristic for finding the top of the address space on Linux. --- libs/wine/mmap.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index a8654dc..28659e1 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -338,15 +338,16 @@ #if defined(__i386__) && !defined(__Free if (stack_ptr >= user_space_limit) { + char *end = 0; char *base = stack_ptr - ((unsigned int)stack_ptr & granularity_mask) - (granularity_mask + 1); if (base > user_space_limit) reserve_area( user_space_limit, base ); base = stack_ptr - ((unsigned int)stack_ptr & granularity_mask) + (granularity_mask + 1); #ifdef linux - /* Linux heuristic: if the stack top is at c0000000, assume the address space */ - /* ends there, this avoids a lot of futile allocation attempts */ - if (base != (char *)0xc0000000) + /* Linux heuristic: assume the stack is near the end of the address */ + /* space, this avoids a lot of futile allocation attempts */ + end = (char *)(((unsigned long)base + 0x0fffffff) & 0xf0000000); #endif - reserve_area( base, 0 ); + reserve_area( base, end ); } else reserve_area( user_space_limit, 0 ); #endif /* __i386__ */

1 0

Robert Reif : advapi32: Add computer sid support to LookupAccountSidW.
by Alexandre Julliard July 31, 2006

July 31, 2006

Module: wine Branch: refs/heads/master Commit: 6d4fb08eceee7fba076341e300f269300aa731c1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6d4fb08eceee7fba076341e… Author: Robert Reif <reif(a)earthlink.net> Date: Mon Jul 31 07:09:21 2006 -0400 advapi32: Add computer sid support to LookupAccountSidW. --- dlls/advapi32/security.c | 72 ++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 60 insertions(+), 12 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 3ff2081..53b2210 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -143,6 +143,7 @@ static const WCHAR DIALUP[] = { 'D','I', static const WCHAR DOMAIN[] = {'D','O','M','A','I','N',0}; static const WCHAR ENTERPRISE_DOMAIN_CONTROLLERS[] = { 'E','N','T','E','R','P','R','I','S','E',' ','D','O','M','A','I','N',' ','C','O','N','T','R','O','L','L','E','R','S',0 }; static const WCHAR Everyone[] = { 'E','v','e','r','y','o','n','e',0 }; +static const WCHAR Guest[] = { 'G','u','e','s','t',0 }; static const WCHAR Guests[] = { 'G','u','e','s','t','s',0 }; static const WCHAR INTERACTIVE[] = { 'I','N','T','E','R','A','C','T','I','V','E',0 }; static const WCHAR LOCAL[] = { 'L','O','C','A','L',0 }; @@ -1825,9 +1826,10 @@ LookupAccountSidW( OUT PSID_NAME_USE name_use ) { int i, j; - const WCHAR * ac = Administrator; /* FIXME */ - const WCHAR * dm = DOMAIN; /* FIXME */ - SID_NAME_USE use = SidTypeUser; /* FIXME */ + const WCHAR * ac = NULL; + const WCHAR * dm = NULL; + SID_NAME_USE use = 0; + LPWSTR computer_name = NULL; TRACE("(%s,sid=%s,%p,%p(%lu),%p,%p(%lu),%p)\n", debugstr_w(system),debugstr_sid(sid), @@ -1840,7 +1842,8 @@ LookupAccountSidW( SetLastError(ERROR_NONE_MAPPED); return FALSE; } - + + /* check the well known SIDs first */ for (i = 0; i <= 60; i++) { if (IsWellKnownSid(sid, i)) { for (j = 0; j < (sizeof(ACCOUNT_SIDS) / sizeof(ACCOUNT_SIDS[0])); j++) { @@ -1854,16 +1857,61 @@ LookupAccountSidW( } } - *accountSize = strlenW(ac)+1; - if (account && (*accountSize > strlenW(ac))) - strcpyW(account, ac); + if (dm == NULL) { + MAX_SID local; + MAX_SID admin; + MAX_SID guest; + + /* check for the local computer next */ + if (ADVAPI_GetComputerSid(&local)) { + DWORD size = MAX_COMPUTERNAME_LENGTH + 1; + BOOL result; + + computer_name = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + result = GetComputerNameW(computer_name, &size); + + if (result) { + CopySid(GetSidLengthRequired(local.SubAuthorityCount), &admin, &local); + admin.SubAuthorityCount++; + admin.SubAuthority[4] = DOMAIN_USER_RID_ADMIN; + CopySid(GetSidLengthRequired(local.SubAuthorityCount), &guest, &local); + guest.SubAuthorityCount++; + guest.SubAuthority[4] = DOMAIN_USER_RID_GUEST; + + if (EqualSid(sid, &local)) { + dm = computer_name; + ac = Blank; + use = 3; + } else if (EqualSid(sid, &admin)) { + dm = computer_name; + ac = Administrator; + use = 1; + } else if (EqualSid(sid, &guest)) { + dm = computer_name; + ac = Guest; + use = 1; + } + } + } + } + + if (dm) { + *accountSize = strlenW(ac)+1; + if (account && (*accountSize > strlenW(ac))) + strcpyW(account, ac); - *domainSize = strlenW(dm)+1; - if (domain && (*domainSize > strlenW(dm))) - strcpyW(domain,dm); + *domainSize = strlenW(dm)+1; + if (domain && (*domainSize > strlenW(dm))) + strcpyW(domain,dm); - *name_use = use; - return TRUE; + *name_use = use; + HeapFree(GetProcessHeap(), 0, computer_name); + return TRUE; + } + + HeapFree(GetProcessHeap(), 0, computer_name); + SetLastError(ERROR_NONE_MAPPED); + return FALSE; } /******************************************************************************

1 0

Robert Reif : advapi32: Add more helper functions.
by Alexandre Julliard July 31, 2006

July 31, 2006

Module: wine Branch: refs/heads/master Commit: 9d435046550dd44801784f96cb3a9ee94c112e7c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9d435046550dd44801784f9… Author: Robert Reif <reif(a)earthlink.net> Date: Mon Jul 31 06:59:43 2006 -0400 advapi32: Add more helper functions. Add ADVAPI_GetComputerSid. --- dlls/advapi32/advapi32_misc.h | 1 + dlls/advapi32/security.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h index 436c0fe..35f806e 100644 --- a/dlls/advapi32/advapi32_misc.h +++ b/dlls/advapi32/advapi32_misc.h @@ -22,5 +22,6 @@ #define __WINE_ADVAPI32MISC_H const char * debugstr_sid(PSID sid); BOOL ADVAPI_IsLocalComputer(LPCWSTR ServerName); +BOOL ADVAPI_GetComputerSid(PSID sid); #endif /* __WINE_ADVAPI32MISC_H */ diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index d2a5d81..3ff2081 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -342,6 +342,43 @@ BOOL ADVAPI_IsLocalComputer(LPCWSTR Serv return Result; } +/************************************************************ + * ADVAPI_GetComputerSid + * + * Reads the computer SID from the registry. + */ +BOOL ADVAPI_GetComputerSid(PSID sid) +{ + HKEY key; + LONG ret; + + if ((ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, + "SECURITY\\SAM\\Domains\\Account", 0, + KEY_READ, &key)) == ERROR_SUCCESS) + { + static const WCHAR V[] = { 'V',0 }; + DWORD size = 0; + ret = RegQueryValueExW(key, V, NULL, NULL, NULL, &size); + if (ret == ERROR_MORE_DATA || ret == ERROR_SUCCESS) + { + BYTE * data = HeapAlloc(GetProcessHeap(), 0, size); + if (data) + { + if ((ret = RegQueryValueExW(key, V, NULL, NULL, + data, &size)) == ERROR_SUCCESS) + { + /* the SID is in the last 24 bytes of the binary data */ + CopyMemory(sid, &data[size-24], 24); + return TRUE; + } + } + } + RegCloseKey(key); + } + + return FALSE; +} + /* ############################## ###### TOKEN FUNCTIONS ###### ##############################

1 0

Jacek Caban : shdocvw: Register SHDocVw typelib.
by Alexandre Julliard July 31, 2006

July 31, 2006

Module: wine Branch: refs/heads/master Commit: e10f5b1d501964b0e07954099c02ab5795496b9e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e10f5b1d501964b0e079540… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 31 13:16:54 2006 +0200 shdocvw: Register SHDocVw typelib. --- dlls/shdocvw/regsvr.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/regsvr.c b/dlls/shdocvw/regsvr.c index 83da050..786262b 100644 --- a/dlls/shdocvw/regsvr.c +++ b/dlls/shdocvw/regsvr.c @@ -650,6 +650,29 @@ err: return (res == ERROR_SUCCESS) ? S_OK : E_FAIL; } +static HRESULT register_typelib(void) +{ + ITypeLib *typelib; + HRESULT hres; + + static WCHAR wszSHDocVw[] = {'s','h','d','o','c','v','w','.','d','l','l',0}; + + hres = LoadTypeLibEx(wszSHDocVw, REGKIND_REGISTER, &typelib); + if(FAILED(hres)) { + ERR("Could not load typelib: %08lx\n", hres); + return hres; + } + + ITypeLib_Release(typelib); + + return hres; +} + +static HRESULT unregister_typelib(void) +{ + return UnRegisterTypeLib(&LIBID_SHDocVw, 1, 1, LOCALE_SYSTEM_DEFAULT, SYS_WIN32); +} + /*********************************************************************** * DllRegisterServer (SHDOCVW.@) */ @@ -664,6 +687,9 @@ HRESULT WINAPI DllRegisterServer(void) hr = register_interfaces(interface_list); if (SUCCEEDED(hr)) hr = register_localserver(); + if(SUCCEEDED(hr)) + hr = register_typelib(); + return hr; } @@ -679,5 +705,8 @@ HRESULT WINAPI DllUnregisterServer(void) hr = unregister_coclasses(coclass_list); if (SUCCEEDED(hr)) hr = unregister_interfaces(interface_list); + if(SUCCEEDED(hr)) + hr = unregister_typelib(); + return hr; }

1 0

Jacek Caban : shdocvw: Added typelib.
by Alexandre Julliard July 31, 2006

July 31, 2006

Module: wine Branch: refs/heads/master Commit: 61d48edf835b4a5ef4d62b0431e8384fe97dc6e1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=61d48edf835b4a5ef4d62b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 31 13:16:36 2006 +0200 shdocvw: Added typelib. --- dlls/shdocvw/Makefile.in | 1 + dlls/shdocvw/shdocvw.rc | 2 ++ dlls/shdocvw/shdocvw_v1.idl | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 0 deletions(-) create mode 100644 dlls/shdocvw/shdocvw_v1.idl diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 137775d..868c405 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -28,6 +28,7 @@ C_SRCS = \ webbrowser.c RC_SRCS = shdocvw.rc +IDL_TLB_SRCS = shdocvw_v1.tlb SUBDIRS = tests diff --git a/dlls/shdocvw/shdocvw.rc b/dlls/shdocvw/shdocvw.rc index 68fccb6..d52263f 100644 --- a/dlls/shdocvw/shdocvw.rc +++ b/dlls/shdocvw/shdocvw.rc @@ -35,3 +35,5 @@ #include "Nl.rc" #include "No.rc" #include "Pt.rc" #include "Tr.rc" + +1 TYPELIB LOADONCALL DISCARDABLE shdocvw_v1.tlb diff --git a/dlls/shdocvw/shdocvw_v1.idl b/dlls/shdocvw/shdocvw_v1.idl new file mode 100644 index 0000000..45b9111 --- /dev/null +++ b/dlls/shdocvw/shdocvw_v1.idl @@ -0,0 +1,19 @@ +/* + * Copyright 2006 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 "exdisp.idl"

1 0