November 2005 - Wine-Commits

wine/tools/winapi win32.api
by Alexandre Julliard Nov. 17, 2005

Nov. 17, 2005

ChangeSet ID: 21300 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/17 05:03:14 Modified files: tools/winapi : win32.api Log message: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Update win32.api to cvs. Patch: http://cvs.winehq.org/patch.py?id=21300 Old revision New revision Changes Path 1.54 1.55 +5 -0 wine/tools/winapi/win32.api Index: wine/tools/winapi/win32.api diff -u -p wine/tools/winapi/win32.api:1.54 wine/tools/winapi/win32.api:1.55 --- wine/tools/winapi/win32.api:1.54 17 Nov 2005 11: 3:14 -0000 +++ wine/tools/winapi/win32.api 17 Nov 2005 11: 3:14 -0000 @@ -4308,6 +4308,7 @@ LPWSTR %long +DWORD HDC HRESULT LCID @@ -4315,6 +4316,7 @@ int %ptr +BYTE * SCRIPT_CACHE * SCRIPT_CONTROL * SCRIPT_DIGITSUBSTITUTE * @@ -4322,7 +4324,10 @@ SCRIPT_FONTPROPERTIES * SCRIPT_ITEM * SCRIPT_PROPERTIES *** SCRIPT_STATE * +SCRIPT_STRING_ANALYSIS * +SCRIPT_TABDEF * int * +void * %wstr

1 0

wine/dlls/msvcrt tests/file.c file.c
by Alexandre Julliard Nov. 16, 2005

Nov. 16, 2005

ChangeSet ID: 21299 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/16 05:47:51 Modified files: dlls/msvcrt/tests: file.c dlls/msvcrt : file.c Log message: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Fix _fcloseall() return value. Improve some trace messages. Add tests for fopen(), fclose(), _fcloseall(). Stricten some checks of _unlink(). Patch: http://cvs.winehq.org/patch.py?id=21299 Old revision New revision Changes Path 1.19 1.20 +46 -4 wine/dlls/msvcrt/tests/file.c 1.91 1.92 +3 -3 wine/dlls/msvcrt/file.c Index: wine/dlls/msvcrt/tests/file.c diff -u -p wine/dlls/msvcrt/tests/file.c:1.19 wine/dlls/msvcrt/tests/file.c:1.20 --- wine/dlls/msvcrt/tests/file.c:1.19 16 Nov 2005 11:47:51 -0000 +++ wine/dlls/msvcrt/tests/file.c 16 Nov 2005 11:47:51 -0000 @@ -265,7 +265,7 @@ static void test_file_write_read( void ) _close(tempfd); ret = unlink(tempf); - ok( ret !=-1 ,"Can't unlink '%s': %d\n", tempf, errno); + ok( ret == 0 ,"Can't unlink '%s': %d\n", tempf, errno); tempf=_tempnam(".","wne"); tempfd = _open(tempf,_O_CREAT|_O_TRUNC|_O_BINARY|_O_RDWR,0); @@ -292,7 +292,7 @@ static void test_file_write_read( void ) ok( ret == 0, "Can't chmod '%s' to read-write: %d\n", tempf, errno); ret = unlink(tempf); - ok( ret !=-1 ,"Can't unlink '%s': %d\n", tempf, errno); + ok( ret == 0 ,"Can't unlink '%s': %d\n", tempf, errno); } static void test_file_inherit_child(const char* fd_s) @@ -335,7 +335,7 @@ static void test_file_inherit( const cha lseek(fd, 0, SEEK_SET); ok(read(fd, buffer, sizeof (buffer)) == 8 && memcmp(buffer, "Success", 8) == 0, "Couldn't read back the data\n"); close (fd); - ok(unlink("fdopen.tst") != 1, "Couldn't unlink\n"); + ok(unlink("fdopen.tst") == 0, "Couldn't unlink\n"); fd = open ("fdopen.tst", O_CREAT | O_RDWR | O_BINARY | O_NOINHERIT, _S_IREAD |_S_IWRITE); ok(fd != -1, "Couldn't create test file\n"); @@ -348,7 +348,7 @@ static void test_file_inherit( const cha ok(tell(fd) == 0, "bad position %lu expecting 0\n", tell(fd)); ok(read(fd, buffer, sizeof (buffer)) == 0, "Found unexpected data (%s)\n", buffer); close (fd); - ok(unlink("fdopen.tst") != 1, "Couldn't unlink\n"); + ok(unlink("fdopen.tst") == 0, "Couldn't unlink\n"); } static void test_tmpnam( void ) @@ -406,6 +406,47 @@ static void test_chsize( void ) _unlink( tempfile ); } +static void test_fopen_fclose_fcloseall( void ) +{ + char fname1[] = "empty1"; + char fname2[] = "empty2"; + char fname3[] = "empty3"; + FILE *stream1, *stream2, *stream3; + int ret, numclosed; + + /* testing fopen() */ + stream1 = fopen(fname1, "w+"); + ok(stream1 != NULL, "The file '%s' was not opened\n", fname1); + stream2 = fopen(fname2, "w "); + ok(stream2 != NULL, "The file '%s' was not opened\n", fname2 ); + _unlink(fname3); + stream3 = fopen(fname3, "r"); + ok(stream3 == NULL, "The file '%s' shouldn't exist before\n", fname3 ); + stream3 = fopen(fname3, "w+"); + ok(stream3 != NULL, "The file '%s' should be opened now\n", fname3 ); + + /* testing fclose() */ + ret = fclose(stream2); + ok(ret == 0, "The file '%s' was not closed\n", fname2); + ret = fclose(stream3); + ok(ret == 0, "The file '%s' was not closed\n", fname3); + ret = fclose(stream2); + ok(ret == EOF, "Closing file '%s' returned %d\n", fname2, ret); + ret = fclose(stream3); + ok(ret == EOF, "Closing file '%s' returned %d\n", fname3, ret); + + /* testing fcloseall() */ + numclosed = _fcloseall(); + /* fname1 should be closed here */ + ok(numclosed == 1, "Number of files closed by fcloseall(): %u\n", numclosed); + numclosed = _fcloseall(); + ok(numclosed == 0, "Number of files closed by fcloseall(): %u\n", numclosed); + + ok(_unlink(fname1) == 0, "Couldn't unlink file named '%s'\n", fname1); + ok(_unlink(fname2) == 0, "Couldn't unlink file named '%s'\n", fname2); + ok(_unlink(fname3) == 0, "Couldn't unlink file named '%s'\n", fname3); +} + START_TEST(file) { int arg_c; @@ -420,6 +461,7 @@ START_TEST(file) } test_fdopen(); + test_fopen_fclose_fcloseall(); test_fileops(); test_fgetwc(); test_file_put_get(); Index: wine/dlls/msvcrt/file.c diff -u -p wine/dlls/msvcrt/file.c:1.91 wine/dlls/msvcrt/file.c:1.92 --- wine/dlls/msvcrt/file.c:1.91 16 Nov 2005 11:47:51 -0000 +++ wine/dlls/msvcrt/file.c 16 Nov 2005 11:47:51 -0000 @@ -529,7 +529,7 @@ int _wchmod(const MSVCRT_wchar_t *path, */ int _unlink(const char *path) { - TRACE("(%s)\n",path); + TRACE("%s\n",debugstr_a(path)); if(DeleteFileA(path)) return 0; TRACE("failed (%ld)\n",GetLastError()); @@ -762,7 +762,7 @@ int MSVCRT__fcloseall(void) LOCK_FILES(); for (i = 3; i < MSVCRT_stream_idx; i++) if (MSVCRT_fstreams[i] && MSVCRT_fstreams[i]->_flag && - MSVCRT_fclose(MSVCRT_fstreams[i])) + !MSVCRT_fclose(MSVCRT_fstreams[i])) num_closed++; UNLOCK_FILES(); @@ -2083,7 +2083,7 @@ int MSVCRT_fclose(MSVCRT_FILE* file) file->_flag = 0; - return ((r==MSVCRT_EOF) || (flag & MSVCRT__IOERR) ? MSVCRT_EOF : 0); + return ((r == -1) || (flag & MSVCRT__IOERR) ? MSVCRT_EOF : 0); } /*********************************************************************

1 0

wine/dlls/shdocvw webbrowser.c shdocvw.h oleob ...
by Alexandre Julliard Nov. 16, 2005

Nov. 16, 2005

ChangeSet ID: 21298 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/16 05:46:56 Modified files: dlls/shdocvw : webbrowser.c shdocvw.h oleobject.c Log message: Jacek Caban <jacek(a)codeweavers.com> Added OLEIVERB_INPLACEACTIVATE implementation in IOleObject::DoVerb. Patch: http://cvs.winehq.org/patch.py?id=21298 Old revision New revision Changes Path 1.22 1.23 +2 -3 wine/dlls/shdocvw/webbrowser.c 1.27 1.28 +13 -0 wine/dlls/shdocvw/shdocvw.h 1.17 1.18 +70 -6 wine/dlls/shdocvw/oleobject.c Index: wine/dlls/shdocvw/webbrowser.c diff -u -p wine/dlls/shdocvw/webbrowser.c:1.22 wine/dlls/shdocvw/webbrowser.c:1.23 --- wine/dlls/shdocvw/webbrowser.c:1.22 16 Nov 2005 11:46:56 -0000 +++ wine/dlls/shdocvw/webbrowser.c 16 Nov 2005 11:46:56 -0000 @@ -121,12 +121,11 @@ static ULONG WINAPI WebBrowser_Release(I TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { - if(This->client) - IOleClientSite_Release(This->client); - if(This->document) IUnknown_Release(This->document); + WebBrowser_OleObject_Destroy(This); + HeapFree(GetProcessHeap(), 0, This); SHDOCVW_UnlockModule(); } Index: wine/dlls/shdocvw/shdocvw.h diff -u -p wine/dlls/shdocvw/shdocvw.h:1.27 wine/dlls/shdocvw/shdocvw.h:1.28 --- wine/dlls/shdocvw/shdocvw.h:1.27 16 Nov 2005 11:46:56 -0000 +++ wine/dlls/shdocvw/shdocvw.h 16 Nov 2005 11:46:56 -0000 @@ -81,6 +81,17 @@ typedef struct { IUnknown *document; IOleClientSite *client; + IOleContainer *container; + + /* window context */ + + HWND iphwnd; + HWND frame_hwnd; + IOleInPlaceFrame *frame; + IOleInPlaceUIWindow *uiwindow; + RECT pos_rect; + RECT clip_rect; + OLEINPLACEFRAMEINFO frameinfo; } WebBrowser; #define WEBBROWSER(x) ((IWebBrowser*) &(x)->lpWebBrowser2Vtbl) @@ -108,6 +119,8 @@ void WebBrowser_Events_Init(WebBrowser*) void WebBrowser_ClientSite_Init(WebBrowser*); +void WebBrowser_OleObject_Destroy(WebBrowser*); + HRESULT WebBrowser_Create(IUnknown*,REFIID,void**); /********************************************************************** Index: wine/dlls/shdocvw/oleobject.c diff -u -p wine/dlls/shdocvw/oleobject.c:1.17 wine/dlls/shdocvw/oleobject.c:1.18 --- wine/dlls/shdocvw/oleobject.c:1.17 16 Nov 2005 11:46:56 -0000 +++ wine/dlls/shdocvw/oleobject.c 16 Nov 2005 11:46:56 -0000 @@ -138,15 +138,58 @@ static HRESULT WINAPI OleObject_DoVerb(I LPOLECLIENTSITE pActiveSite, LONG lindex, HWND hwndParent, LPCRECT lprcPosRect) { WebBrowser *This = OLEOBJ_THIS(iface); - FIXME("(%p)->(%ld %p %p %ld %p %p)\n", This, iVerb, lpmsg, pActiveSite, lindex, hwndParent, + HRESULT hres; + + TRACE("(%p)->(%ld %p %p %ld %p %p)\n", This, iVerb, lpmsg, pActiveSite, lindex, hwndParent, lprcPosRect); + switch (iVerb) { - case OLEIVERB_INPLACEACTIVATE: - FIXME ("stub for OLEIVERB_INPLACEACTIVATE\n"); - break; - case OLEIVERB_HIDE: - FIXME ("stub for OLEIVERB_HIDE\n"); + case OLEIVERB_INPLACEACTIVATE: { + IOleInPlaceSite *inplace; + + TRACE("OLEIVERB_INPLACEACTIVATE\n"); + + if(!pActiveSite) + return E_INVALIDARG; + + hres = IOleClientSite_QueryInterface(pActiveSite, &IID_IOleInPlaceSite, (void**)&inplace); + if(FAILED(hres)) { + WARN("Could not get IOleInPlaceSite\n"); + return hres; + } + + hres = IOleInPlaceSite_CanInPlaceActivate(inplace); + if(hres != S_OK) { + WARN("CanInPlaceActivate returned: %08lx\n", hres); + IOleInPlaceSite_Release(inplace); + return E_FAIL; + } + + hres = IOleInPlaceSite_GetWindow(inplace, &This->iphwnd); + if(FAILED(hres)) + This->iphwnd = hwndParent; + + IOleInPlaceSite_OnInPlaceActivate(inplace); + + IOleInPlaceSite_GetWindowContext(inplace, &This->frame, &This->uiwindow, + &This->pos_rect, &This->clip_rect, + &This->frameinfo); + + IOleInPlaceSite_Release(inplace); + + if(This->client) { + IOleClientSite_ShowObject(This->client); + IOleClientSite_GetContainer(This->client, &This->container); + } + + if(This->frame) + IOleInPlaceFrame_GetWindow(This->frame, &This->frame_hwnd); + + return S_OK; + } + default: + FIXME("stub for %ld\n", iVerb); break; } @@ -450,4 +493,25 @@ void WebBrowser_OleObject_Init(WebBrowse This->lpOleControlVtbl = &OleControlVtbl; This->client = NULL; + This->container = NULL; + This->iphwnd = NULL; + This->frame_hwnd = NULL; + This->frame = NULL; + This->uiwindow = NULL; + + memset(&This->pos_rect, 0, sizeof(RECT)); + memset(&This->clip_rect, 0, sizeof(RECT)); + memset(&This->frameinfo, 0, sizeof(OLEINPLACEFRAMEINFO)); +} + +void WebBrowser_OleObject_Destroy(WebBrowser *This) +{ + if(This->client) + IOleClientSite_Release(This->client); + if(This->container) + IOleContainer_Release(This->container); + if(This->frame) + IOleInPlaceFrame_Release(This->frame); + if(This->uiwindow) + IOleInPlaceUIWindow_Release(This->uiwindow); }

1 0

wine/ programs/Makefile.in ./configure.ac ./co ...
by Alexandre Julliard Nov. 16, 2005

Nov. 16, 2005

ChangeSet ID: 21297 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/16 05:45:52 Modified files: programs : Makefile.in . : configure.ac configure Added files: programs/explorer: explorer.c Makefile.in .cvsignore Log message: Aric Stewart <aric(a)codeweavers.com> Beginnings of an explorer.exe replacement that wraps the existing winefile program. Patch: http://cvs.winehq.org/patch.py?id=21297 Old revision New revision Changes Path Added 1.1 +0 -0 wine/programs/explorer/explorer.c Added 1.1 +0 -0 wine/programs/explorer/Makefile.in Added 1.1 +0 -0 wine/programs/explorer/.cvsignore 1.49 1.50 +7 -0 wine/programs/Makefile.in 1.412 1.413 +1 -0 wine/configure.ac 1.715 1.716 +2 -1 wine/configure

1 0

wine/programs/winedbg winedbg.man.in winedbg.c ...
by Alexandre Julliard Nov. 16, 2005

Nov. 16, 2005

ChangeSet ID: 21296 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/16 05:23:07 Modified files: programs/winedbg: winedbg.man.in winedbg.c debugger.h dbg.y Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> Added ability to execute commands from a file passed on command line (through --file option). Use that feature to get rid of arg_command hack (--command option now creates a temporary file). Patch: http://cvs.winehq.org/patch.py?id=21296 Old revision New revision Changes Path 1.1 1.2 +20 -6 wine/programs/winedbg/winedbg.man.in 1.39 1.40 +47 -8 wine/programs/winedbg/winedbg.c 1.30 1.31 +1 -2 wine/programs/winedbg/debugger.h 1.27 1.28 +15 -20 wine/programs/winedbg/dbg.y

1 0

wine/dlls/user tests/msg.c edit.c
by Alexandre Julliard Nov. 16, 2005

Nov. 16, 2005

ChangeSet ID: 21295 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/16 05:22:55 Modified files: dlls/user/tests: msg.c dlls/user : edit.c Log message: Dmitry Timoshkov <dmitry(a)codeweavers.com> Add a test for some edit control behaviours, make it pass under Wine. Patch: http://cvs.winehq.org/patch.py?id=21295 Old revision New revision Changes Path 1.103 1.104 +230 -0 wine/dlls/user/tests/msg.c 1.41 1.42 +27 -13 wine/dlls/user/edit.c

1 0

wine/dlls/winmm/wavemap wavemap.c
by Alexandre Julliard Nov. 16, 2005

Nov. 16, 2005

ChangeSet ID: 21294 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/16 05:22:06 Modified files: dlls/winmm/wavemap: wavemap.c Log message: Robert Reif <reif(a)earthlink.net> Only convert bits per sample between different encoding formats. Patch: http://cvs.winehq.org/patch.py?id=21294 Old revision New revision Changes Path 1.45 1.46 +57 -45 wine/dlls/winmm/wavemap/wavemap.c Index: wine/dlls/winmm/wavemap/wavemap.c diff -u -p wine/dlls/winmm/wavemap/wavemap.c:1.45 wine/dlls/winmm/wavemap/wavemap.c:1.46 --- wine/dlls/winmm/wavemap/wavemap.c:1.45 16 Nov 2005 11:22: 6 -0000 +++ wine/dlls/winmm/wavemap/wavemap.c 16 Nov 2005 11:22: 6 -0000 @@ -194,7 +194,7 @@ static DWORD wodOpen(LPDWORD lpdwUser, L } } - if ((dwFlags & WAVE_FORMAT_DIRECT) == 0 && lpDesc->lpFormat->wFormatTag == WAVE_FORMAT_PCM) { + if ((dwFlags & WAVE_FORMAT_DIRECT) == 0) { WAVEFORMATEX wfx; wfx.wFormatTag = WAVE_FORMAT_PCM; @@ -208,51 +208,63 @@ static DWORD wodOpen(LPDWORD lpdwUser, L default: goto error; \ } - /* Our resampling algorithm is quite primitive so first try - * to just change the bit depth and number of channels - */ - for (i = ndlo; i < ndhi; i++) { - wfx.nSamplesPerSec=lpDesc->lpFormat->nSamplesPerSec; - wfx.nChannels = lpDesc->lpFormat->nChannels; - TRY(wfx.nSamplesPerSec, 16); - TRY(wfx.nSamplesPerSec, 8); - wfx.nChannels ^= 3; - TRY(wfx.nSamplesPerSec, 16); - TRY(wfx.nSamplesPerSec, 8); - } - - for (i = ndlo; i < ndhi; i++) { - /* first try with same stereo/mono option as source */ - wfx.nChannels = lpDesc->lpFormat->nChannels; - TRY(96000, 16); - TRY(48000, 16); - TRY(44100, 16); - TRY(22050, 16); - TRY(11025, 16); - - /* 2^3 => 1, 1^3 => 2, so if stereo, try mono (and the other way around) */ - wfx.nChannels ^= 3; - TRY(96000, 16); - TRY(48000, 16); - TRY(44100, 16); - TRY(22050, 16); - TRY(11025, 16); - - /* first try with same stereo/mono option as source */ - wfx.nChannels = lpDesc->lpFormat->nChannels; - TRY(96000, 8); - TRY(48000, 8); - TRY(44100, 8); - TRY(22050, 8); - TRY(11025, 8); + if (lpDesc->lpFormat->wFormatTag != WAVE_FORMAT_PCM) { + /* Format changed so keep sample rate and number of channels + * the same and just change the bit depth + */ + for (i = ndlo; i < ndhi; i++) { + wfx.nSamplesPerSec=lpDesc->lpFormat->nSamplesPerSec; + wfx.nChannels = lpDesc->lpFormat->nChannels; + TRY(wfx.nSamplesPerSec, 16); + TRY(wfx.nSamplesPerSec, 8); + } + } else { + /* Our resampling algorithm is quite primitive so first try + * to just change the bit depth and number of channels + */ + for (i = ndlo; i < ndhi; i++) { + wfx.nSamplesPerSec=lpDesc->lpFormat->nSamplesPerSec; + wfx.nChannels = lpDesc->lpFormat->nChannels; + TRY(wfx.nSamplesPerSec, 16); + TRY(wfx.nSamplesPerSec, 8); + wfx.nChannels ^= 3; + TRY(wfx.nSamplesPerSec, 16); + TRY(wfx.nSamplesPerSec, 8); + } - /* 2^3 => 1, 1^3 => 2, so if stereo, try mono (and the other way around) */ - wfx.nChannels ^= 3; - TRY(96000, 8); - TRY(48000, 8); - TRY(44100, 8); - TRY(22050, 8); - TRY(11025, 8); + for (i = ndlo; i < ndhi; i++) { + /* first try with same stereo/mono option as source */ + wfx.nChannels = lpDesc->lpFormat->nChannels; + TRY(96000, 16); + TRY(48000, 16); + TRY(44100, 16); + TRY(22050, 16); + TRY(11025, 16); + + /* 2^3 => 1, 1^3 => 2, so if stereo, try mono (and the other way around) */ + wfx.nChannels ^= 3; + TRY(96000, 16); + TRY(48000, 16); + TRY(44100, 16); + TRY(22050, 16); + TRY(11025, 16); + + /* first try with same stereo/mono option as source */ + wfx.nChannels = lpDesc->lpFormat->nChannels; + TRY(96000, 8); + TRY(48000, 8); + TRY(44100, 8); + TRY(22050, 8); + TRY(11025, 8); + + /* 2^3 => 1, 1^3 => 2, so if stereo, try mono (and the other way around) */ + wfx.nChannels ^= 3; + TRY(96000, 8); + TRY(48000, 8); + TRY(44100, 8); + TRY(22050, 8); + TRY(11025, 8); + } } #undef TRY }

1 0

wine/ include/ws2tcpip.h dlls/winsock/socket.c
by Alexandre Julliard Nov. 16, 2005

Nov. 16, 2005

ChangeSet ID: 21293 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/16 05:21:57 Modified files: include : ws2tcpip.h dlls/winsock : socket.c Log message: Marcus Meissner <marcus(a)jet.franken.de> Added mapping between unix and windows sockaddr_in6(_old) and sockaddr_in. Added address family, socket type mappers. Patch: http://cvs.winehq.org/patch.py?id=21293 Old revision New revision Changes Path 1.5 1.6 +13 -1 wine/include/ws2tcpip.h 1.193 1.194 +192 -40 wine/dlls/winsock/socket.c

1 0

wine/dlls/wininet tests/http.c internet.c
by Alexandre Julliard Nov. 16, 2005

Nov. 16, 2005

ChangeSet ID: 21292 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/16 05:21:41 Modified files: dlls/wininet/tests: http.c dlls/wininet : internet.c Log message: Robert Shearman <rob(a)codeweavers.com> - Improve callback to give context sensitive information about the different statuses and print the thread ID that it was called from. - Replace the busy waiting on the "goon" flag with an event. - Replace hard coded numbers with more informative constants throughout the InternetReadFile test. - Add tests for InternetReadFileExA. - Fix the error value from calling InternetReadFile with a NULL handle as indicated by the test. Patch: http://cvs.winehq.org/patch.py?id=21292 Old revision New revision Changes Path 1.30 1.31 +261 -54 wine/dlls/wininet/tests/http.c 1.141 1.142 +1 -1 wine/dlls/wininet/internet.c

1 0

wine/dlls/shdocvw shdocvw.h client.c
by Alexandre Julliard Nov. 16, 2005

Nov. 16, 2005

ChangeSet ID: 21291 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/16 05:21:00 Modified files: dlls/shdocvw : shdocvw.h client.c Log message: Jacek Caban <jacek(a)codeweavers.com> Added IOleInPlaceSite stub implementation. Patch: http://cvs.winehq.org/patch.py?id=21291 Old revision New revision Changes Path 1.26 1.27 +2 -0 wine/dlls/shdocvw/shdocvw.h 1.1 1.2 +136 -1 wine/dlls/shdocvw/client.c Index: wine/dlls/shdocvw/shdocvw.h diff -u -p wine/dlls/shdocvw/shdocvw.h:1.26 wine/dlls/shdocvw/shdocvw.h:1.27 --- wine/dlls/shdocvw/shdocvw.h:1.26 16 Nov 2005 11:21: 0 -0000 +++ wine/dlls/shdocvw/shdocvw.h 16 Nov 2005 11:21: 0 -0000 @@ -74,6 +74,7 @@ typedef struct { /* Interfaces available for embeded document */ const IOleClientSiteVtbl *lpOleClientSiteVtbl; + const IOleInPlaceSiteVtbl *lpOleInPlaceSiteVtbl; LONG ref; @@ -96,6 +97,7 @@ typedef struct { #define VIEWOBJ2(x) ((IViewObject2*) &(x)->lpViewObjectVtbl); #define CLIENTSITE(x) ((IOleClientSite*) &(x)->lpOleClientSiteVtbl) +#define INPLACESITE(x) ((IOleInPlaceSite*) &(x)->lpOleInPlaceSiteVtbl) void WebBrowser_OleObject_Init(WebBrowser*); void WebBrowser_ViewObject_Init(WebBrowser*); Index: wine/dlls/shdocvw/client.c diff -u -p wine/dlls/shdocvw/client.c:1.1 wine/dlls/shdocvw/client.c:1.2 --- wine/dlls/shdocvw/client.c:1.1 16 Nov 2005 11:21: 0 -0000 +++ wine/dlls/shdocvw/client.c 16 Nov 2005 11:21: 0 -0000 @@ -35,6 +35,12 @@ static HRESULT WINAPI ClientSite_QueryIn }else if(IsEqualGUID(&IID_IOleClientSite, riid)) { TRACE("(%p)->(IID_IOleClientSite %p)\n", This, ppv); *ppv = CLIENTSITE(This); + }else if(IsEqualGUID(&IID_IOleWindow, riid)) { + TRACE("(%p)->(IID_IOleWindow %p)\n", This, ppv); + *ppv = INPLACESITE(This); + }else if(IsEqualGUID(&IID_IOleInPlaceSite, riid)) { + TRACE("(%p)->(IID_IOleInPlaceSite %p)\n", This, ppv); + *ppv = INPLACESITE(This); } if(*ppv) { @@ -116,7 +122,136 @@ static const IOleClientSiteVtbl OleClien ClientSite_RequestNewObjectLayout }; +#define INPLACESITE_THIS(iface) DEFINE_THIS(WebBrowser, OleInPlaceSite, iface) + +static HRESULT WINAPI InPlaceSite_QueryInterface(IOleInPlaceSite *iface, REFIID riid, void **ppv) +{ + WebBrowser *This = INPLACESITE_THIS(iface); + return IOleClientSite_QueryInterface(CLIENTSITE(This), riid, ppv); +} + +static ULONG WINAPI InPlaceSite_AddRef(IOleInPlaceSite *iface) +{ + WebBrowser *This = INPLACESITE_THIS(iface); + return IOleClientSite_AddRef(CLIENTSITE(This)); +} + +static ULONG WINAPI InPlaceSite_Release(IOleInPlaceSite *iface) +{ + WebBrowser *This = INPLACESITE_THIS(iface); + return IOleClientSite_Release(CLIENTSITE(This)); +} + +static HRESULT WINAPI InPlaceSite_GetWindow(IOleInPlaceSite *iface, HWND *phwnd) +{ + WebBrowser *This = INPLACESITE_THIS(iface); + FIXME("(%p)->(%p)\n", This, phwnd); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceSite_ContextSensitiveHelp(IOleInPlaceSite *iface, BOOL fEnterMode) +{ + WebBrowser *This = INPLACESITE_THIS(iface); + FIXME("(%p)->(%x)\n", This, fEnterMode); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceSite_CanInPlaceActivate(IOleInPlaceSite *iface) +{ + WebBrowser *This = INPLACESITE_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceSite_OnInPlaceActivate(IOleInPlaceSite *iface) +{ + WebBrowser *This = INPLACESITE_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceSite_OnUIActivate(IOleInPlaceSite *iface) +{ + WebBrowser *This = INPLACESITE_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceSite_GetWindowContext(IOleInPlaceSite *iface, + IOleInPlaceFrame **ppFrame, IOleInPlaceUIWindow **ppDoc, LPRECT lprcPosRect, + LPRECT lprcClipRect, LPOLEINPLACEFRAMEINFO lpFrameInfo) +{ + WebBrowser *This = INPLACESITE_THIS(iface); + FIXME("(%p)->(%p %p %p %p %p)\n", This, ppFrame, ppDoc, lprcPosRect, + lprcClipRect, lpFrameInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceSite_Scroll(IOleInPlaceSite *iface, SIZE scrollExtent) +{ + WebBrowser *This = INPLACESITE_THIS(iface); + FIXME("(%p)->({%ld %ld})\n", This, scrollExtent.cx, scrollExtent.cy); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceSite_OnUIDeactivate(IOleInPlaceSite *iface, BOOL fUndoable) +{ + WebBrowser *This = INPLACESITE_THIS(iface); + FIXME("(%p)->(%x)\n", This, fUndoable); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceSite_OnInPlaceDeactivate(IOleInPlaceSite *iface) +{ + WebBrowser *This = INPLACESITE_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceSite_DiscardUndoState(IOleInPlaceSite *iface) +{ + WebBrowser *This = INPLACESITE_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceSite_DeactivateAndUndo(IOleInPlaceSite *iface) +{ + WebBrowser *This = INPLACESITE_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceSite_OnPosRectChange(IOleInPlaceSite *iface, + LPCRECT lprcPosRect) +{ + WebBrowser *This = INPLACESITE_THIS(iface); + FIXME("(%p)->(%p)\n", This, lprcPosRect); + return E_NOTIMPL; +} + +#undef INPLACESITE_THIS + +static const IOleInPlaceSiteVtbl OleInPlaceSiteVtbl = { + InPlaceSite_QueryInterface, + InPlaceSite_AddRef, + InPlaceSite_Release, + InPlaceSite_GetWindow, + InPlaceSite_ContextSensitiveHelp, + InPlaceSite_CanInPlaceActivate, + InPlaceSite_OnInPlaceActivate, + InPlaceSite_OnUIActivate, + InPlaceSite_GetWindowContext, + InPlaceSite_Scroll, + InPlaceSite_OnUIDeactivate, + InPlaceSite_OnInPlaceDeactivate, + InPlaceSite_DiscardUndoState, + InPlaceSite_DeactivateAndUndo, + InPlaceSite_OnPosRectChange +}; + void WebBrowser_ClientSite_Init(WebBrowser *This) { - This->lpOleClientSiteVtbl = &OleClientSiteVtbl; + This->lpOleClientSiteVtbl = &OleClientSiteVtbl; + This->lpOleInPlaceSiteVtbl = &OleInPlaceSiteVtbl; }

1 0