June 2007 - Wine-commits - list.winehq.org

Misha Koshelev : shell32/tests: Allow individual tests in check_lnk to be todo_wine'd.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: f8eabe0d37592958a8b19da0748ce0a7cf2a9c5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8eabe0d37592958a8b19da07… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu Jun 28 19:55:56 2007 -0500 shell32/tests: Allow individual tests in check_lnk to be todo_wine'd. --- dlls/shell32/tests/shelllink.c | 34 ++++++++++++++++++++-------------- 1 files changed, 20 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 473aae7..c9b1ec4 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -306,7 +306,13 @@ static void test_get_set(void) */ #define lok ok_(__FILE__, line) -#define check_lnk(a,b) check_lnk_(__LINE__, (a), (b)) +#define lok_todo_4(todo_flag,a,b,c,d) \ + if ((todo & todo_flag) == 0) lok((a), (b), (c), (d)); \ + else todo_wine lok((a), (b), (c), (d)); +#define lok_todo_2(todo_flag,a,b) \ + if ((todo & todo_flag) == 0) lok((a), (b)); \ + else todo_wine lok((a), (b)); +#define check_lnk(a,b,c) check_lnk_(__LINE__, (a), (b), (c)) void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int save_fails) { @@ -382,7 +388,7 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int save_fails) IShellLinkA_Release(sl); } -static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) +static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo) { HRESULT r; IShellLinkA *sl; @@ -417,7 +423,7 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) strcpy(buffer,"garbage"); r = IShellLinkA_GetDescription(sl, buffer, sizeof(buffer)); lok(SUCCEEDED(r), "GetDescription failed (0x%08x)\n", r); - lok(lstrcmp(buffer, desc->description)==0, + lok_todo_4(0x1, lstrcmp(buffer, desc->description)==0, "GetDescription returned '%s' instead of '%s'\n", buffer, desc->description); } @@ -426,7 +432,7 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) strcpy(buffer,"garbage"); r = IShellLinkA_GetWorkingDirectory(sl, buffer, sizeof(buffer)); lok(SUCCEEDED(r), "GetWorkingDirectory failed (0x%08x)\n", r); - lok(lstrcmpi(buffer, desc->workdir)==0, + lok_todo_4(0x2, lstrcmpi(buffer, desc->workdir)==0, "GetWorkingDirectory returned '%s' instead of '%s'\n", buffer, desc->workdir); } @@ -435,7 +441,7 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) strcpy(buffer,"garbage"); r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), NULL, SLGP_RAWPATH); lok(SUCCEEDED(r), "GetPath failed (0x%08x)\n", r); - lok(lstrcmpi(buffer, desc->path)==0, + lok_todo_4(0x4, lstrcmpi(buffer, desc->path)==0, "GetPath returned '%s' instead of '%s'\n", buffer, desc->path); } @@ -444,7 +450,7 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) LPITEMIDLIST pidl=NULL; r = IShellLinkA_GetIDList(sl, &pidl); lok(SUCCEEDED(r), "GetIDList failed (0x%08x)\n", r); - lok(pILIsEqual(pidl, desc->pidl), + lok_todo_2(0x8, pILIsEqual(pidl, desc->pidl), "GetIDList returned an incorrect pidl\n"); } if (desc->showcmd) @@ -452,7 +458,7 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) int i=0xdeadbeef; r = IShellLinkA_GetShowCmd(sl, &i); lok(SUCCEEDED(r), "GetShowCmd failed (0x%08x)\n", r); - lok(i==desc->showcmd, + lok_todo_4(0x10, i==desc->showcmd, "GetShowCmd returned 0x%0x instead of 0x%0x\n", i, desc->showcmd); } @@ -462,10 +468,10 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) strcpy(buffer,"garbage"); r = IShellLinkA_GetIconLocation(sl, buffer, sizeof(buffer), &i); lok(SUCCEEDED(r), "GetIconLocation failed (0x%08x)\n", r); - lok(lstrcmpi(buffer, desc->icon)==0, + lok_todo_4(0x20, lstrcmpi(buffer, desc->icon)==0, "GetIconLocation returned '%s' instead of '%s'\n", buffer, desc->icon); - lok(i==desc->icon_id, + lok_todo_4(0x20, i==desc->icon_id, "GetIconLocation returned 0x%0x instead of 0x%0x\n", i, desc->icon_id); } @@ -474,7 +480,7 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) WORD i=0xbeef; r = IShellLinkA_GetHotkey(sl, &i); lok(SUCCEEDED(r), "GetHotkey failed (0x%08x)\n", r); - lok(i==desc->hotkey, + lok_todo_4(0x40, i==desc->hotkey, "GetHotkey returned 0x%04x instead of 0x%04x\n", i, desc->hotkey); } @@ -501,7 +507,7 @@ static void test_load_save(void) desc.path=""; desc.arguments=""; desc.icon=""; - check_lnk(lnkfile, &desc); + check_lnk(lnkfile, &desc, 0x0); /* Point a .lnk file to nonexistent files */ desc.description=""; @@ -514,7 +520,7 @@ static void test_load_save(void) desc.icon_id=1234; desc.hotkey=0; create_lnk(lnkfile, &desc, 0); - check_lnk(lnkfile, &desc); + check_lnk(lnkfile, &desc, 0x0); r=GetModuleFileName(NULL, mypath, sizeof(mypath)); ok(r>=0 && r<sizeof(mypath), "GetModuleFileName failed (%d)\n", r); @@ -534,7 +540,7 @@ static void test_load_save(void) desc.icon_id=0; desc.hotkey=0x1234; create_lnk(lnkfile, &desc, 0); - check_lnk(lnkfile, &desc); + check_lnk(lnkfile, &desc, 0x0); /* Overwrite the existing lnk file and test link to a command on the path */ desc.description="command on path"; @@ -550,7 +556,7 @@ static void test_load_save(void) /* Check that link is created to proper location */ SearchPathA( NULL, desc.path, NULL, MAX_PATH, realpath, NULL); desc.path=realpath; - check_lnk(lnkfile, &desc); + check_lnk(lnkfile, &desc, 0x0); /* FIXME: Also test saving a .lnk pointing to a pidl that cannot be * represented as a path.

1 0

H. Verbeet : wined3d: Get rid of the oneToOneTexUnitMap field.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: 860aa6993bbb98f6ecc94cdcf97b194e55284ea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=860aa6993bbb98f6ecc94cdcf… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Jun 28 23:32:59 2007 +0200 wined3d: Get rid of the oneToOneTexUnitMap field. --- dlls/wined3d/device.c | 1 - dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 947038a..ed6b6f9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1819,7 +1819,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR This->rev_tex_unit_map[state] = -1; } } - This->oneToOneTexUnitMap = TRUE; /* Setup the implicit swapchain */ TRACE("Creating implicit swapchain\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 135114f..77978a3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -727,7 +727,6 @@ struct IWineD3DDeviceImpl DWORD texUnitMap[MAX_COMBINED_SAMPLERS]; DWORD rev_tex_unit_map[MAX_COMBINED_SAMPLERS]; BOOL fixed_function_usage_map[MAX_TEXTURES]; - BOOL oneToOneTexUnitMap; /* Stream source management */ WineDirect3DVertexStridedData strided_streams;

1 0

Misha Koshelev : shell32/tests: Add test for shell links to existing non-executable files.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: 75fbca227bbadec07eea0e5212406742a8de0b3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=75fbca227bbadec07eea0e521… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu Jun 28 19:56:00 2007 -0500 shell32/tests: Add test for shell links to existing non-executable files. --- dlls/shell32/tests/shelllink.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index c9b1ec4..dc139e4 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -495,6 +495,7 @@ static void test_load_save(void) char mydir[MAX_PATH]; char realpath[MAX_PATH]; char* p; + HANDLE hf; DWORD r; /* Save an empty .lnk file */ @@ -558,6 +559,37 @@ static void test_load_save(void) desc.path=realpath; check_lnk(lnkfile, &desc, 0x0); + /* Create a temporary non-executable file */ + r=GetTempPath(sizeof(mypath), mypath); + ok(r>=0 && r<sizeof(mypath), "GetTempPath failed (%d), err %d\n", r, GetLastError()); + r=GetLongPathName(mypath, mydir, sizeof(mydir)); + ok(r>=0 && r<sizeof(mydir), "GetLongPathName failed (%d), err %d\n", r, GetLastError()); + p=strrchr(mydir, '\\'); + if (p) + *p='\0'; + + strcpy(mypath, mydir); + strcat(mypath, "\\test.txt"); + hf = CreateFile(mypath, GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + CloseHandle(hf); + + /* Overwrite the existing lnk file and test link to an existing non-executable file */ + desc.description="non-executable file"; + desc.workdir=mydir; + desc.path=mypath; + desc.pidl=NULL; + desc.arguments=""; + desc.showcmd=SW_SHOWNORMAL; + desc.icon=mypath; + desc.icon_id=0; + desc.hotkey=0x1234; + create_lnk(lnkfile, &desc, 0); + check_lnk(lnkfile, &desc, 0x4); + + r = DeleteFileA(mypath); + ok(r, "failed to delete file %s (%d)\n", mypath, GetLastError()); + /* FIXME: Also test saving a .lnk pointing to a pidl that cannot be * represented as a path. */

1 0

H. Verbeet : wined3d: In device_map_psamplers(), only touch the sampler mapping for samplers that are used by the shader.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: 92fc808b05df5df49d85698ad0b5fd871cc5c048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92fc808b05df5df49d85698ad… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Jun 28 23:32:53 2007 +0200 wined3d: In device_map_psamplers(), only touch the sampler mapping for samplers that are used by the shader. --- dlls/wined3d/device.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5d3a7ce..947038a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3291,10 +3291,11 @@ static void device_map_fixed_function_samplers(IWineD3DDeviceImpl *This) { } static void device_map_psamplers(IWineD3DDeviceImpl *This) { + DWORD *sampler_tokens = ((IWineD3DPixelShaderImpl *)This->stateBlock->pixelShader)->baseShader.reg_maps.samplers; int i; for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) { - if (This->texUnitMap[i] != i) { + if (sampler_tokens[i] && This->texUnitMap[i] != i) { device_map_stage(This, i, i); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(i)); if (i < MAX_TEXTURES) {

1 0

H. Verbeet : wined3d: Cleanup device_map_fixed_function_samplers().
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: 99e3abab3028ee38bd107d888988e64e029731f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99e3abab3028ee38bd107d888… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Jun 28 23:32:38 2007 +0200 wined3d: Cleanup device_map_fixed_function_samplers(). --- dlls/wined3d/device.c | 34 +++++----------------------------- 1 files changed, 5 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 55b161d..5d3a7ce 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3263,47 +3263,23 @@ static void device_map_fixed_function_samplers(IWineD3DDeviceImpl *This) { device_update_fixed_function_usage_map(This); if (This->stateBlock->lowest_disabled_stage <= GL_LIMITS(textures)) { - for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) { + for (i = 0; i < This->stateBlock->lowest_disabled_stage; ++i) { + if (!This->fixed_function_usage_map[i]) continue; + if (This->texUnitMap[i] != i) { device_map_stage(This, i, i); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(i)); - if (i < MAX_TEXTURES) { - markTextureStagesDirty(This, i); - } + markTextureStagesDirty(This, i); } } return; } - /* No pixel shader, and we do not have enough texture units available. Try to skip NULL textures - * First, see if we can succeed at all - */ - tex = 0; - for (i = 0; i < This->stateBlock->lowest_disabled_stage; ++i) { - if (!This->fixed_function_usage_map[i]) ++tex; - } - - if (GL_LIMITS(textures) + tex < This->stateBlock->lowest_disabled_stage) { - FIXME("Too many bound textures to support the combiner settings\n"); - return; - } - /* Now work out the mapping */ tex = 0; - This->oneToOneTexUnitMap = FALSE; - WARN("Non 1:1 mapping UNTESTED!\n"); for (i = 0; i < This->stateBlock->lowest_disabled_stage; ++i) { - /* Skip NULL textures */ - if (!This->fixed_function_usage_map[i]) { - /* Map to -1, so the check below doesn't fail if a non-NULL - * texture is set on this stage */ - TRACE("Mapping texture stage %d to -1\n", i); - device_map_stage(This, i, -1); - - continue; - } + if (!This->fixed_function_usage_map[i]) continue; - TRACE("Mapping texture stage %d to unit %d\n", i, tex); if (This->texUnitMap[i] != tex) { device_map_stage(This, i, tex); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(i));

1 0

Alexandre Julliard : ws2_32: Don't print traces from async I/O callbacks.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: 0bd2b548da3036fc2eba0eab24ae3865b781a14f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bd2b548da3036fc2eba0eab2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 29 13:40:48 2007 +0200 ws2_32: Don't print traces from async I/O callbacks. --- dlls/ws2_32/socket.c | 31 ++----------------------------- 1 files changed, 2 insertions(+), 29 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index aab3888..92fd3f6 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1074,8 +1074,6 @@ static int WS2_recv( int fd, struct iovec* iov, int count, struct msghdr hdr; union generic_unix_sockaddr unix_sockaddr; int n; - TRACE( "fd %d, iovec %p, count %d addr %s, len %p, flags %x\n", - fd, iov, count, debugstr_sockaddr(lpFrom), lpFromlen, *lpFlags); hdr.msg_name = NULL; @@ -1099,10 +1097,7 @@ static int WS2_recv( int fd, struct iovec* iov, int count, #endif if ( (n = recvmsg(fd, &hdr, *lpFlags)) == -1 ) - { - TRACE( "recvmsg error %d\n", errno); return -1; - } if ( lpFrom && ws_sockaddr_u2ws( &unix_sockaddr.addr, lpFrom, lpFromlen ) != 0 ) @@ -1110,10 +1105,8 @@ static int WS2_recv( int fd, struct iovec* iov, int count, /* The from buffer was too small, but we read the data * anyway. Is that really bad? */ - WARN( "Address buffer too small\n" ); } - TRACE("-> %d\n", n); return n; } @@ -1127,8 +1120,6 @@ static NTSTATUS WS2_async_recv( void* user, IO_STATUS_BLOCK* iosb, NTSTATUS stat ws2_async* wsa = user; int result = 0, fd; - TRACE( "(%p %p %x)\n", wsa, iosb, status ); - switch (status) { case STATUS_ALERTED: @@ -1141,7 +1132,6 @@ static NTSTATUS WS2_async_recv( void* user, IO_STATUS_BLOCK* iosb, NTSTATUS stat if (result >= 0) { status = STATUS_SUCCESS; - TRACE( "received %d bytes\n", result ); _enable_event( wsa->hSocket, FD_READ, 0, 0 ); } else @@ -1150,13 +1140,11 @@ static NTSTATUS WS2_async_recv( void* user, IO_STATUS_BLOCK* iosb, NTSTATUS stat { status = STATUS_PENDING; _enable_event( wsa->hSocket, FD_READ, 0, 0 ); - TRACE( "still pending\n" ); } else { result = 0; status = wsaErrno(); /* FIXME: is this correct ???? */ - TRACE( "Error: %x\n", status ); } } break; @@ -1180,10 +1168,9 @@ static int WS2_send( int fd, struct iovec* iov, int count, struct msghdr hdr; union generic_unix_sockaddr unix_addr; - TRACE( "fd %d, iovec %p, count %d, addr %s, len %d, flags %x\n", - fd, iov, count, debugstr_sockaddr(to), tolen, dwFlags); hdr.msg_name = NULL; + hdr.msg_namelen = 0; if ( to ) { @@ -1195,10 +1182,9 @@ static int WS2_send( int fd, struct iovec* iov, int count, return -1; } -#ifdef HAVE_IPX +#if defined(HAVE_IPX) && defined(SOL_IPX) if(to->sa_family == WS_AF_IPX) { -#ifdef SOL_IPX struct sockaddr_ipx* uipx = (struct sockaddr_ipx*)hdr.msg_name; int val=0; unsigned int len=sizeof(int); @@ -1209,17 +1195,10 @@ static int WS2_send( int fd, struct iovec* iov, int count, * ipx type in the sockaddr_opx structure with the stored value. */ if(getsockopt(fd, SOL_IPX, IPX_TYPE, &val, &len) != -1) - { - TRACE("ptype: %d (fd:%d)\n", val, fd); uipx->sipx_type = val; - } -#endif } #endif - } - else - hdr.msg_namelen = 0; hdr.msg_iov = iov; hdr.msg_iovlen = count; @@ -1245,8 +1224,6 @@ static NTSTATUS WS2_async_send(void* user, IO_STATUS_BLOCK* iosb, NTSTATUS statu ws2_async* wsa = user; int result = 0, fd; - TRACE( "(%p %p %x)\n", wsa, iosb, status ); - switch (status) { case STATUS_ALERTED: @@ -1260,7 +1237,6 @@ static NTSTATUS WS2_async_send(void* user, IO_STATUS_BLOCK* iosb, NTSTATUS statu if (result >= 0) { status = STATUS_SUCCESS; - TRACE( "sent %d bytes\n", result ); _enable_event( wsa->hSocket, FD_WRITE, 0, 0 ); } else @@ -1269,7 +1245,6 @@ static NTSTATUS WS2_async_send(void* user, IO_STATUS_BLOCK* iosb, NTSTATUS statu { status = STATUS_PENDING; _enable_event( wsa->hSocket, FD_WRITE, 0, 0 ); - TRACE( "still pending\n" ); } else { @@ -1277,7 +1252,6 @@ static NTSTATUS WS2_async_send(void* user, IO_STATUS_BLOCK* iosb, NTSTATUS statu later in NtStatusToWSAError () */ status = wsaErrno(); result = 0; - TRACE( "Error: %x\n", status ); } } break; @@ -1300,7 +1274,6 @@ static NTSTATUS WS2_async_shutdown( void* user, PIO_STATUS_BLOCK iosb, NTSTATUS ws2_async* wsa = user; int fd, err = 1; - TRACE( "async %p %d\n", wsa, wsa->type ); switch (status) { case STATUS_ALERTED:

1 0

Alexandre Julliard : ntdll: Don't print traces from async I/O callbacks.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: 1b57c3bf9071f6d3fd56b042357074d7a9f89acf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b57c3bf9071f6d3fd56b0423… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 29 13:40:42 2007 +0200 ntdll: Don't print traces from async I/O callbacks. --- dlls/ntdll/directory.c | 5 ----- dlls/ntdll/file.c | 12 ------------ 2 files changed, 0 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 9975455..d4ccf5f 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2187,8 +2187,6 @@ static NTSTATUS read_changes_apc( void *user, PIO_STATUS_BLOCK iosb, NTSTATUS st NTSTATUS ret = STATUS_SUCCESS; int len, action, i; - TRACE("%p %p %08x\n", info, iosb, status); - SERVER_START_REQ( read_change ) { req->handle = info->FileHandle; @@ -2218,9 +2216,6 @@ static NTSTATUS read_changes_apc( void *user, PIO_STATUS_BLOCK iosb, NTSTATUS st pfni->Action = action; pfni->FileNameLength = len * sizeof (WCHAR); pfni->FileName[len] = 0; - - TRACE("action = %d name = %s\n", pfni->Action, - debugstr_w(pfni->FileName) ); len = sizeof (*pfni) - sizeof (DWORD) + pfni->FileNameLength; } else diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 2f23862..e84490f 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -324,8 +324,6 @@ static NTSTATUS FILE_AsyncReadService(void *user, PIO_STATUS_BLOCK iosb, NTSTATU async_fileio_read *fileio = user; int fd, needs_close, result; - TRACE("%p %p 0x%x\n", iosb, fileio->buffer, status); - switch (status) { case STATUS_ALERTED: /* got some new data */ @@ -340,10 +338,7 @@ static NTSTATUS FILE_AsyncReadService(void *user, PIO_STATUS_BLOCK iosb, NTSTATU if (result < 0) { if (errno == EAGAIN || errno == EINTR) - { - TRACE("Deferred read %d\n", errno); status = STATUS_PENDING; - } else /* check to see if the transfer is complete */ status = FILE_GetNtStatus(); } @@ -364,10 +359,6 @@ static NTSTATUS FILE_AsyncReadService(void *user, PIO_STATUS_BLOCK iosb, NTSTATU */ status = (fileio->avail_mode) ? STATUS_SUCCESS : STATUS_PENDING; } - - TRACE("read %d more bytes %u/%u so far (%s)\n", - result, fileio->already, fileio->count, - (status == STATUS_SUCCESS) ? "success" : "pending"); } break; @@ -709,8 +700,6 @@ static NTSTATUS FILE_AsyncWriteService(void *user, IO_STATUS_BLOCK *iosb, NTSTAT int result, fd, needs_close; enum server_fd_type type; - TRACE("(%p %p 0x%x)\n",iosb, fileio->buffer, status); - switch (status) { case STATUS_ALERTED: @@ -735,7 +724,6 @@ static NTSTATUS FILE_AsyncWriteService(void *user, IO_STATUS_BLOCK *iosb, NTSTAT { fileio->already += result; status = (fileio->already < fileio->count) ? STATUS_PENDING : STATUS_SUCCESS; - TRACE("wrote %d more bytes %u/%u so far\n", result, fileio->already, fileio->count); } break;

1 0

Jacek Caban : mshtml: Add IID_IPropertyNotifySink and DIID_HTMLTextContainerEvents connection points to HTMLBodyElement .
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: 21836d21cfa6b8f23b4ea86d9d73482de67bebd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21836d21cfa6b8f23b4ea86d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 29 02:58:42 2007 +0200 mshtml: Add IID_IPropertyNotifySink and DIID_HTMLTextContainerEvents connection points to HTMLBodyElement. --- dlls/mshtml/htmlbody.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index c06dcc5..40d8983 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -41,6 +41,8 @@ typedef struct { HTMLTextContainer text_container; ConnectionPointContainer cp_container; + ConnectionPoint cp_propnotif; + ConnectionPoint cp_txtcontevents; HTMLElement *element; nsIDOMHTMLBodyElement *nsbody; @@ -493,7 +495,11 @@ void HTMLBodyElement_Create(HTMLElement *element) HTMLTextContainer_Init(&ret->text_container, element); - ConnectionPointContainer_Init(&ret->cp_container, NULL, (IUnknown*)HTMLBODY(ret)); + ConnectionPoint_Init(&ret->cp_propnotif, CONPTCONT(&ret->cp_container), + &IID_IPropertyNotifySink, NULL); + ConnectionPoint_Init(&ret->cp_txtcontevents, CONPTCONT(&ret->cp_container), + &DIID_HTMLTextContainerEvents, &ret->cp_propnotif); + ConnectionPointContainer_Init(&ret->cp_container, &ret->cp_propnotif, (IUnknown*)HTMLBODY(ret)); nsres = nsIDOMHTMLElement_QueryInterface(element->nselem, &IID_nsIDOMHTMLBodyElement, (void**)&ret->nsbody);

1 0

Jacek Caban : mshtml: Added IConnectionPointContainer implementation to HTMLBodyElement.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: 982dce485a356a29e0d92e5eca7cdac11e2b7ecf URL: http://source.winehq.org/git/wine.git/?a=commit;h=982dce485a356a29e0d92e5ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 29 02:50:39 2007 +0200 mshtml: Added IConnectionPointContainer implementation to HTMLBodyElement. --- dlls/mshtml/htmlbody.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index ee23922..c06dcc5 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -40,6 +40,8 @@ typedef struct { HTMLTextContainer text_container; + ConnectionPointContainer cp_container; + HTMLElement *element; nsIDOMHTMLBodyElement *nsbody; } HTMLBodyElement; @@ -68,6 +70,9 @@ static HRESULT WINAPI HTMLBodyElement_QueryInterface(IHTMLBodyElement *iface, }else if(IsEqualGUID(&IID_IHTMLTextContainer, riid)) { TRACE("(%p)->(IID_IHTMLTextContainer %p)\n", This, ppv); *ppv = HTMLTEXTCONT(&This->text_container); + }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { + TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppv); + *ppv = CONPTCONT(&This->cp_container); } if(*ppv) { @@ -428,6 +433,7 @@ static void HTMLBodyElement_destructor(IUnknown *iface) { HTMLBodyElement *This = HTMLBODY_THIS(iface); + ConnectionPointContainer_Destroy(&This->cp_container); nsIDOMHTMLBodyElement_Release(This->nsbody); mshtml_free(This); } @@ -487,6 +493,8 @@ void HTMLBodyElement_Create(HTMLElement *element) HTMLTextContainer_Init(&ret->text_container, element); + ConnectionPointContainer_Init(&ret->cp_container, NULL, (IUnknown*)HTMLBODY(ret)); + nsres = nsIDOMHTMLElement_QueryInterface(element->nselem, &IID_nsIDOMHTMLBodyElement, (void**)&ret->nsbody); if(NS_FAILED(nsres))

1 0

Jacek Caban : mshtml: Move IConnectionPointContainer to the separated struct.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: f09a6f7283fc825a38fe0222954ab34784b82504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f09a6f7283fc825a38fe02229… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 29 02:49:27 2007 +0200 mshtml: Move IConnectionPointContainer to the separated struct. --- dlls/mshtml/conpoint.c | 31 +++++++++++++++++-------------- dlls/mshtml/htmldoc.c | 6 +++--- dlls/mshtml/mshtml_private.h | 14 ++++++++++---- 3 files changed, 30 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index 7900ff6..b19ca16 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -107,7 +107,7 @@ static HRESULT WINAPI ConnectionPoint_GetConnectionPointContainer(IConnectionPoi if(!ppCPC) return E_POINTER; - *ppCPC = CONPTCONT(This->doc); + *ppCPC = CONPTCONT(&This->doc->cp_container); IConnectionPointContainer_AddRef(*ppCPC); return S_OK; } @@ -209,31 +209,31 @@ static void ConnectionPoint_Destroy(ConnectionPoint *This) mshtml_free(This->sinks); } -#define CONPTCONT_THIS(iface) DEFINE_THIS(HTMLDocument, ConnectionPointContainer, iface) +#define CONPTCONT_THIS(iface) DEFINE_THIS(ConnectionPointContainer, ConnectionPointContainer, iface) static HRESULT WINAPI ConnectionPointContainer_QueryInterface(IConnectionPointContainer *iface, REFIID riid, void **ppv) { - HTMLDocument *This = CONPTCONT_THIS(iface); - return IHTMLDocument2_QueryInterface(HTMLDOC(This), riid, ppv); + ConnectionPointContainer *This = CONPTCONT_THIS(iface); + return IUnknown_QueryInterface(This->outer, riid, ppv); } static ULONG WINAPI ConnectionPointContainer_AddRef(IConnectionPointContainer *iface) { - HTMLDocument *This = CONPTCONT_THIS(iface); - return IHTMLDocument2_AddRef(HTMLDOC(This)); + ConnectionPointContainer *This = CONPTCONT_THIS(iface); + return IUnknown_AddRef(This->outer); } static ULONG WINAPI ConnectionPointContainer_Release(IConnectionPointContainer *iface) { - HTMLDocument *This = CONPTCONT_THIS(iface); - return IHTMLDocument2_Release(HTMLDOC(This)); + ConnectionPointContainer *This = CONPTCONT_THIS(iface); + return IUnknown_Release(This->outer); } static HRESULT WINAPI ConnectionPointContainer_EnumConnectionPoints(IConnectionPointContainer *iface, IEnumConnectionPoints **ppEnum) { - HTMLDocument *This = CONPTCONT_THIS(iface); + ConnectionPointContainer *This = CONPTCONT_THIS(iface); FIXME("(%p)->(%p)\n", This, ppEnum); return E_NOTIMPL; } @@ -241,14 +241,14 @@ static HRESULT WINAPI ConnectionPointContainer_EnumConnectionPoints(IConnectionP static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPointContainer *iface, REFIID riid, IConnectionPoint **ppCP) { - HTMLDocument *This = CONPTCONT_THIS(iface); + ConnectionPointContainer *This = CONPTCONT_THIS(iface); ConnectionPoint *iter; TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppCP); *ppCP = NULL; - for(iter = &This->cp_propnotif; iter; iter = iter->next) { + for(iter = This->cp_list; iter; iter = iter->next) { if(IsEqualGUID(&iter->iid, riid)) *ppCP = CONPOINT(iter); } @@ -272,14 +272,17 @@ static const IConnectionPointContainerVtbl ConnectionPointContainerVtbl = { #undef CONPTCONT_THIS -void HTMLDocument_ConnectionPoints_Init(HTMLDocument *This) +void ConnectionPointContainer_Init(ConnectionPointContainer *This, ConnectionPoint *cp_list, + IUnknown *outer) { This->lpConnectionPointContainerVtbl = &ConnectionPointContainerVtbl; + This->cp_list = cp_list; + This->outer = outer; } -void HTMLDocument_ConnectionPoints_Destroy(HTMLDocument *This) +void ConnectionPointContainer_Destroy(ConnectionPointContainer *This) { - ConnectionPoint *iter = &This->cp_propnotif; + ConnectionPoint *iter = This->cp_list; while(iter) { ConnectionPoint_Destroy(iter); diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 649a849..b5eee9a 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -109,7 +109,7 @@ static HRESULT WINAPI HTMLDocument_QueryInterface(IHTMLDocument2 *iface, REFIID *ppvObject = HLNKTARGET(This); }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppvObject); - *ppvObject = CONPTCONT(This); + *ppvObject = CONPTCONT(&This->cp_container); }else if(IsEqualGUID(&IID_IPersistStreamInit, riid)) { TRACE("(%p)->(IID_IPersistStreamInit %p)\n", This, ppvObject); *ppvObject = PERSTRINIT(This); @@ -171,7 +171,7 @@ static ULONG WINAPI HTMLDocument_Release(IHTMLDocument2 *iface) release_nodes(This); - HTMLDocument_ConnectionPoints_Destroy(This); + ConnectionPointContainer_Destroy(&This->cp_container); if(This->nscontainer) NSContainer_Release(This->nscontainer); @@ -1141,12 +1141,12 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) HTMLDocument_Window_Init(ret); HTMLDocument_Service_Init(ret); HTMLDocument_Hlink_Init(ret); - HTMLDocument_ConnectionPoints_Init(ret); ConnectionPoint_Init(&ret->cp_propnotif, ret, &IID_IPropertyNotifySink, NULL); ConnectionPoint_Init(&ret->cp_htmldocevents, ret, &DIID_HTMLDocumentEvents, &ret->cp_propnotif); ConnectionPoint_Init(&ret->cp_htmldocevents2, ret, &DIID_HTMLDocumentEvents2, &ret->cp_htmldocevents); + ConnectionPointContainer_Init(&ret->cp_container, &ret->cp_propnotif, (IUnknown*)HTMLDOC(ret)); ret->nscontainer = NSContainer_Create(ret, NULL); ret->window = HTMLWindow_Create(ret); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 40bf08f..ecdab3d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -71,6 +71,13 @@ typedef enum { EDITMODE } USERMODE; +typedef struct { + const IConnectionPointContainerVtbl *lpConnectionPointContainerVtbl; + + ConnectionPoint *cp_list; + IUnknown *outer; +} ConnectionPointContainer; + struct ConnectionPoint { const IConnectionPointVtbl *lpConnectionPointVtbl; @@ -104,7 +111,6 @@ struct HTMLDocument { const IOleCommandTargetVtbl *lpOleCommandTargetVtbl; const IOleControlVtbl *lpOleControlVtbl; const IHlinkTargetVtbl *lpHlinkTargetVtbl; - const IConnectionPointContainerVtbl *lpConnectionPointContainerVtbl; const IPersistStreamInitVtbl *lpPersistStreamInitVtbl; LONG ref; @@ -137,6 +143,7 @@ struct HTMLDocument { DWORD update; + ConnectionPointContainer cp_container; ConnectionPoint cp_htmldocevents; ConnectionPoint cp_htmldocevents2; ConnectionPoint cp_propnotif; @@ -338,11 +345,10 @@ void HTMLDocument_View_Init(HTMLDocument*); void HTMLDocument_Window_Init(HTMLDocument*); void HTMLDocument_Service_Init(HTMLDocument*); void HTMLDocument_Hlink_Init(HTMLDocument*); -void HTMLDocument_ConnectionPoints_Init(HTMLDocument*); - -void HTMLDocument_ConnectionPoints_Destroy(HTMLDocument*); void ConnectionPoint_Init(ConnectionPoint*,HTMLDocument*,REFIID,ConnectionPoint*); +void ConnectionPointContainer_Init(ConnectionPointContainer*,ConnectionPoint*,IUnknown*); +void ConnectionPointContainer_Destroy(ConnectionPointContainer*); NSContainer *NSContainer_Create(HTMLDocument*,NSContainer*); void NSContainer_Release(NSContainer*);

1 0