October 2006 - Wine-Commits

Ivan Gyurdiev : wined3d: Set correct default for DMAPOFFSET sampler state.
by Alexandre Julliard Oct. 30, 2006

Oct. 30, 2006

Module: wine Branch: master Commit: a648d4e3a3864fd90c143f9414a30d5e9f74b3a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a648d4e3a3864fd90c143f941… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Sat Oct 28 19:55:03 2006 -0400 wined3d: Set correct default for DMAPOFFSET sampler state. --- dlls/wined3d/stateblock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 084b43d..e7221a2 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1020,7 +1020,7 @@ static HRESULT WINAPI IWineD3DStateBloc This->samplerState[i][WINED3DSAMP_MAXANISOTROPY ] = 1; This->samplerState[i][WINED3DSAMP_SRGBTEXTURE ] = 0; /* TODO: Gamma correction value*/ This->samplerState[i][WINED3DSAMP_ELEMENTINDEX ] = 0; /* TODO: Indicates which element of a multielement texture to use */ - This->samplerState[i][WINED3DSAMP_DMAPOFFSET ] = 256; /* TODO: Vertex offset in the presampled displacement map */ + This->samplerState[i][WINED3DSAMP_DMAPOFFSET ] = 0; /* TODO: Vertex offset in the presampled displacement map */ } /* Under DirectX you can have texture stage operations even if no texture is

1 0

Ivan Gyurdiev : wined3d: Fix GetTexture() for uninitialized textures.
by Alexandre Julliard Oct. 30, 2006

Oct. 30, 2006

Module: wine Branch: master Commit: 61f906148472606178a021b77f97f8583a408c9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=61f906148472606178a021b77… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Sat Oct 28 19:54:25 2006 -0400 wined3d: Fix GetTexture() for uninitialized textures. --- dlls/wined3d/device.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d82bf4e..33b4e87 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5820,8 +5820,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl *ppTexture=This->updateStateBlock->textures[Stage]; if (*ppTexture) IWineD3DBaseTexture_AddRef(*ppTexture); - else - return WINED3DERR_INVALIDCALL; + return WINED3D_OK; }

1 0

Ivan Gyurdiev : d3d9: Pass test as argument to print handler.
by Alexandre Julliard Oct. 30, 2006

Oct. 30, 2006

Module: wine Branch: master Commit: 3160ad76f724ec51b30ffe7cae300793081f17a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3160ad76f724ec51b30ffe7ca… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Sat Oct 28 19:49:18 2006 -0400 d3d9: Pass test as argument to print handler. --- dlls/d3d9/tests/stateblock.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index 32d8508..630b2b1 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -133,7 +133,7 @@ typedef struct state_test { /* Test data handlers */ void (*set_handler) (IDirect3DDevice9* device, const struct state_test* test, const void* data_in); void (*get_handler) (IDirect3DDevice9* device, const struct state_test* test, void* data_out); - void (*print_handler) (const void* data); + void (*print_handler) (const struct state_test* test, const void* data); /* Test arguments */ const void* test_arg; @@ -205,9 +205,9 @@ static void execute_test_chain( if (test[i].print_handler) { trace("Returned data was:\n"); - test[i].print_handler(test[i].return_data); + test[i].print_handler(&test[i], test[i].return_data); trace("Test data was:\n"); - test[i].print_handler(test[i].test_data_out); + test[i].print_handler(&test[i], test[i].test_data_out); } } @@ -219,9 +219,9 @@ static void execute_test_chain( if (test[i].print_handler) { trace("Returned data was:\n"); - test[i].print_handler(test[i].return_data); + test[i].print_handler(&test[i], test[i].return_data); trace("Default data was:\n"); - test[i].print_handler(test[i].default_data); + test[i].print_handler(&test[i], test[i].default_data); } } @@ -233,9 +233,9 @@ static void execute_test_chain( if (test[i].print_handler) { trace("Returned data was:\n"); - test[i].print_handler(test[i].return_data); + test[i].print_handler(&test[i], test[i].return_data); trace("Initial data was:\n"); - test[i].print_handler(test[i].initial_data); + test[i].print_handler(&test[i], test[i].initial_data); } } } @@ -492,6 +492,7 @@ typedef struct shader_constant_context { } shader_constant_context; static void shader_constant_print_handler( + const state_test* test, const void* data) { const shader_constant_data* scdata = data; @@ -633,6 +634,7 @@ typedef struct light_context { } light_context; static void light_print_handler( + const state_test* test, const void* data) { const light_data* ldata = data; @@ -794,6 +796,7 @@ static inline void print_matrix( } static void transform_print_handler( + const state_test* test, const void* data) { const transform_data* tdata = data; @@ -1096,6 +1099,7 @@ static void render_state_get_handler( } static void render_state_print_handler( + const state_test* test, const void* data) { const render_state_data* rsdata = data;

1 0

Ivan Gyurdiev : d3d9: Make the "Tests executed" counter stable.
by Alexandre Julliard Oct. 30, 2006

Oct. 30, 2006

Module: wine Branch: master Commit: 2d8aed6b03971164a1862a1f129464b2bf646a5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d8aed6b03971164a1862a1f1… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Sat Oct 28 19:51:37 2006 -0400 d3d9: Make the "Tests executed" counter stable. --- dlls/d3d9/tests/stateblock.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index 630b2b1..bfed524 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -197,13 +197,13 @@ static void execute_test_chain( memcpy(test[i].return_data, test[i].poison_data, test[i].data_size); test[i].get_handler(device, &test[i], test[i].return_data); - if ((outcome & EVENT_CHECK_TEST) && - memcmp(test[i].test_data_out, test[i].return_data, test[i].data_size)) { + if (outcome & EVENT_CHECK_TEST) { - ok(FALSE, "Test %s, Stage %u: change applied, but returned data does not " - "match test data [csize=%u]\n", test[i].test_name, j, test[i].data_size); + BOOL test_failed = memcmp(test[i].test_data_out, test[i].return_data, test[i].data_size); + ok(!test_failed, "Test %s, Stage %u: returned data does not match test data [csize=%u]\n", + test[i].test_name, j, test[i].data_size); - if (test[i].print_handler) { + if (test_failed && test[i].print_handler) { trace("Returned data was:\n"); test[i].print_handler(&test[i], test[i].return_data); trace("Test data was:\n"); @@ -211,13 +211,13 @@ static void execute_test_chain( } } - else if ((outcome & EVENT_CHECK_DEFAULT) && - memcmp(test[i].default_data, test[i].return_data, test[i].data_size)) { + else if (outcome & EVENT_CHECK_DEFAULT) { + + BOOL test_failed = memcmp(test[i].default_data, test[i].return_data, test[i].data_size); + ok (!test_failed, "Test %s, Stage %u: returned data does not match default data [csize=%u]\n", + test[i].test_name, j, test[i].data_size); - ok (FALSE, "Test %s, Stage %u: change aborted, but returned data does not " - "match default data [csize=%u]\n", test[i].test_name, j, test[i].data_size); - - if (test[i].print_handler) { + if (test_failed && test[i].print_handler) { trace("Returned data was:\n"); test[i].print_handler(&test[i], test[i].return_data); trace("Default data was:\n"); @@ -225,13 +225,13 @@ static void execute_test_chain( } } - else if ((outcome & EVENT_CHECK_INITIAL) && - memcmp(test[i].initial_data, test[i].return_data, test[i].data_size)) { - - ok (FALSE, "Test %s, Stage %u: returned data does not " - "match initial data [csize=%u]\n", test[i].test_name, j, test[i].data_size); + else if (outcome & EVENT_CHECK_INITIAL) { + + BOOL test_failed = memcmp(test[i].initial_data, test[i].return_data, test[i].data_size); + ok (!test_failed, "Test %s, Stage %u: returned data does not match initial data [csize=%u]\n", + test[i].test_name, j, test[i].data_size); - if (test[i].print_handler) { + if (test_failed && test[i].print_handler) { trace("Returned data was:\n"); test[i].print_handler(&test[i], test[i].return_data); trace("Initial data was:\n");

1 0

Jacek Caban : mshtml: Added put_innerHTML implementation.
by Alexandre Julliard Oct. 30, 2006

Oct. 30, 2006

Module: wine Branch: master Commit: abd764674a39fbed5ac8555031bed52f1dc8b81e URL: http://source.winehq.org/git/wine.git/?a=commit;h=abd764674a39fbed5ac855503… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 29 19:15:02 2006 +0100 mshtml: Added put_innerHTML implementation. --- dlls/mshtml/htmlelem.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 4fad4ec..5a19805 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -531,8 +531,28 @@ static HRESULT WINAPI HTMLElement_get_of static HRESULT WINAPI HTMLElement_put_innerHTML(IHTMLElement *iface, BSTR v) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsIDOMNSHTMLElement *nselem; + nsAString html_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsres = nsIDOMHTMLElement_QueryInterface(This->nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMNSHTMLElement: %08x\n", nsres); + return E_FAIL; + } + + nsAString_Init(&html_str, v); + nsres = nsIDOMNSHTMLElement_SetInnerHTML(nselem, &html_str); + nsAString_Finish(&html_str); + + if(NS_FAILED(nsres)) { + FIXME("SetInnerHtml failed %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLElement_get_innerHTML(IHTMLElement *iface, BSTR *p)

1 0

Jacek Caban : shlwapi: Added SHQueueUserWorkItem implementation.
by Alexandre Julliard Oct. 30, 2006

Oct. 30, 2006

Module: wine Branch: master Commit: 587156f43e13d5e012670a4c22f07234607a4337 URL: http://source.winehq.org/git/wine.git/?a=commit;h=587156f43e13d5e012670a4c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 29 19:09:42 2006 +0100 shlwapi: Added SHQueueUserWorkItem implementation. --- dlls/shlwapi/ordinal.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 6e4cc2d..90025b4 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4317,10 +4317,17 @@ DWORD WINAPI SHGetShellKey(DWORD a, DWOR /*********************************************************************** * SHQueueUserWorkItem (SHLWAPI.@) */ -HRESULT WINAPI SHQueueUserWorkItem(DWORD a, DWORD b, DWORD c, DWORD d, DWORD e, DWORD f, DWORD g) +BOOL WINAPI SHQueueUserWorkItem(LPTHREAD_START_ROUTINE pfnCallback, + LPVOID pContext, LONG lPriority, DWORD_PTR dwTag, + DWORD_PTR *pdwId, LPCSTR pszModule, DWORD dwFlags) { - FIXME("(%x, %x, %x, %x, %x, %x, %x): stub\n", a, b, c, d, e, f, g); - return E_FAIL; + TRACE("(%p, %p, %d, %lx, %p, %s, %08x)\n", pfnCallback, pContext, + lPriority, dwTag, pdwId, debugstr_a(pszModule), dwFlags); + + if(lPriority || dwTag || pdwId || pszModule || dwFlags) + FIXME("Unsupported arguments\n"); + + return QueueUserWorkItem(pfnCallback, pContext, 0); } /***********************************************************************

1 0

Jacek Caban : wininet: Call SendCallback in destructor instead of InternetCloseHandle.
by Alexandre Julliard Oct. 30, 2006

Oct. 30, 2006

Module: wine Branch: master Commit: 760043c2455a90cd74178d98b7c81bfbfc81793f URL: http://source.winehq.org/git/wine.git/?a=commit;h=760043c2455a90cd74178d98b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 29 18:58:06 2006 +0100 wininet: Call SendCallback in destructor instead of InternetCloseHandle. --- dlls/wininet/ftp.c | 12 ++++++++++++ dlls/wininet/http.c | 8 ++++++++ dlls/wininet/internet.c | 10 ++++------ 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index c615611..ded0155 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2689,6 +2689,10 @@ static void FTP_CloseSessionHandle(LPWIN TRACE("\n"); + INTERNET_SendCallback(hdr, hdr->dwContext, + INTERNET_STATUS_HANDLE_CLOSING, &hdr->hInternet, + sizeof(HINTERNET)); + WININET_Release(&lpwfs->lpAppInfo->hdr); if (lpwfs->download_in_progress != NULL) @@ -2779,6 +2783,10 @@ static void FTP_CloseFindNextHandle(LPWI TRACE("\n"); + INTERNET_SendCallback(hdr, hdr->dwContext, + INTERNET_STATUS_HANDLE_CLOSING, &hdr->hInternet, + sizeof(HINTERNET)); + WININET_Release(&lpwfn->lpFtpSession->hdr); for (i = 0; i < lpwfn->size; i++) @@ -2805,6 +2813,10 @@ static void FTP_CloseFileTransferHandle( TRACE("\n"); + INTERNET_SendCallback(hdr, hdr->dwContext, + INTERNET_STATUS_HANDLE_CLOSING, &hdr->hInternet, + sizeof(HINTERNET)); + WININET_Release(&lpwh->lpFtpSession->hdr); if (!lpwh->session_deleted) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d9aee10..b85185e 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2939,6 +2939,10 @@ static void HTTP_CloseHTTPRequestHandle( TRACE("\n"); + INTERNET_SendCallback(hdr, hdr->dwContext, + INTERNET_STATUS_HANDLE_CLOSING, &hdr->hInternet, + sizeof(HINTERNET)); + WININET_Release(&lpwhr->hdr); if (NETCON_connected(&lpwhr->netConnection)) @@ -2973,6 +2977,10 @@ static void HTTP_CloseHTTPSessionHandle( TRACE("%p\n", lpwhs); + INTERNET_SendCallback(hdr, hdr->dwContext, + INTERNET_STATUS_HANDLE_CLOSING, &hdr->hInternet, + sizeof(HINTERNET)); + WININET_Release(&lpwhs->lpAppInfo->hdr); HeapFree(GetProcessHeap(), 0, lpwhs->lpszHostName); diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 2e653b9..7ee0b88 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -975,6 +975,10 @@ static VOID INTERNET_CloseHandle(LPWININ TRACE("%p\n",lpwai); + INTERNET_SendCallback(hdr, hdr->dwContext, + INTERNET_STATUS_HANDLE_CLOSING, &hdr->hInternet, + sizeof(HINTERNET)); + HeapFree(GetProcessHeap(), 0, lpwai->lpszAgent); HeapFree(GetProcessHeap(), 0, lpwai->lpszProxy); HeapFree(GetProcessHeap(), 0, lpwai->lpszProxyBypass); @@ -1007,12 +1011,6 @@ BOOL WINAPI InternetCloseHandle(HINTERNE return FALSE; } - /* FIXME: native appears to send this from the equivalent of - * WININET_Release */ - INTERNET_SendCallback(lpwh, lpwh->dwContext, - INTERNET_STATUS_HANDLE_CLOSING, &hInternet, - sizeof(HINTERNET)); - WININET_FreeHandle( hInternet ); WININET_Release( lpwh );

1 0

Jacek Caban : wininet: Store handle in WININETHANDLEHEADER and use it in SendCallback.
by Alexandre Julliard Oct. 30, 2006

Oct. 30, 2006

Module: wine Branch: master Commit: ae430f93239ce13ff73e63bf966fe011c2642bdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae430f93239ce13ff73e63bf9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 29 18:57:11 2006 +0100 wininet: Store handle in WININETHANDLEHEADER and use it in SendCallback. --- dlls/wininet/internet.c | 19 +++---------------- dlls/wininet/internet.h | 1 + dlls/wininet/utility.c | 13 ++----------- 3 files changed, 6 insertions(+), 27 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 4f2256a..2e653b9 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -151,26 +151,13 @@ HINTERNET WININET_AllocHandle( LPWININET end: LeaveCriticalSection( &WININET_cs ); - return (HINTERNET) (handle+1); + return info->hInternet = (HINTERNET) (handle+1); } HINTERNET WININET_FindHandle( LPWININETHANDLEHEADER info ) { - UINT i, handle = 0; - - EnterCriticalSection( &WININET_cs ); - for( i=0; i<WININET_dwMaxHandles; i++ ) - { - if( info == WININET_Handles[i] ) - { - WININET_AddRef( info ); - handle = i+1; - break; - } - } - LeaveCriticalSection( &WININET_cs ); - - return (HINTERNET) handle; + WININET_AddRef(info); + return info->hInternet; } LPWININETHANDLEHEADER WININET_AddRef( LPWININETHANDLEHEADER info ) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index c57cef7..43b1c85 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -139,6 +139,7 @@ typedef void (*WININET_object_destructor struct _WININETHANDLEHEADER { WH_TYPE htype; + HINTERNET hInternet; DWORD dwFlags; DWORD dwContext; DWORD dwError; diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index 7e3ca0f..4f969f8 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -214,7 +214,6 @@ VOID INTERNET_SendCallback(LPWININETHAND DWORD dwInternetStatus, LPVOID lpvStatusInfo, DWORD dwStatusInfoLength) { - HINTERNET hHttpSession; LPVOID lpvNewInfo = NULL; if( !hdr->lpfnStatusCB ) @@ -225,12 +224,6 @@ VOID INTERNET_SendCallback(LPWININETHAND if( !dwContext ) return; - hHttpSession = WININET_FindHandle( hdr ); - if( !hHttpSession ) { - TRACE(" Could not convert header '%p' into a handle !\n", hdr); - return; - } - lpvNewInfo = lpvStatusInfo; if(hdr->dwInternalFlags & INET_CALLBACKW) { switch(dwInternetStatus) { @@ -249,18 +242,16 @@ VOID INTERNET_SendCallback(LPWININETHAND } TRACE(" callback(%p) (%p (%p), %08x, %d (%s), %p, %d)\n", - hdr->lpfnStatusCB, hHttpSession, hdr, dwContext, dwInternetStatus, get_callback_name(dwInternetStatus), + hdr->lpfnStatusCB, hdr->hInternet, hdr, dwContext, dwInternetStatus, get_callback_name(dwInternetStatus), lpvNewInfo, dwStatusInfoLength); - hdr->lpfnStatusCB(hHttpSession, dwContext, dwInternetStatus, + hdr->lpfnStatusCB(hdr->hInternet, dwContext, dwInternetStatus, lpvNewInfo, dwStatusInfoLength); TRACE(" end callback().\n"); if(lpvNewInfo != lpvStatusInfo) HeapFree(GetProcessHeap(), 0, lpvNewInfo); - - WININET_Release( hdr ); }

1 0

Jacek Caban : wininet: Remove lpwhparent from WININETHANDLERHEADER.
by Alexandre Julliard Oct. 30, 2006

Oct. 30, 2006

Module: wine Branch: master Commit: 957516f8e62b740e9d21132c68d9ff0780ef2d77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=957516f8e62b740e9d21132c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 29 18:56:10 2006 +0100 wininet: Remove lpwhparent from WININETHANDLERHEADER. --- dlls/wininet/ftp.c | 5 ----- dlls/wininet/http.c | 2 -- dlls/wininet/internet.c | 3 --- dlls/wininet/internet.h | 1 - 4 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 06b0153..c615611 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1037,7 +1037,6 @@ HINTERNET FTP_FtpOpenFileW(LPWININETFTPS lpwh->hdr.htype = WH_HFILE; lpwh->hdr.dwFlags = dwFlags; lpwh->hdr.dwContext = dwContext; - lpwh->hdr.lpwhparent = WININET_AddRef( &lpwfs->hdr ); lpwh->hdr.dwRefCount = 1; lpwh->hdr.destroy = FTP_CloseFileTransferHandle; lpwh->hdr.lpfnStatusCB = lpwfs->hdr.lpfnStatusCB; @@ -1722,7 +1721,6 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW nServerPort = INTERNET_DEFAULT_FTP_PORT; lpwfs->hdr.htype = WH_HFTPSESSION; - lpwfs->hdr.lpwhparent = WININET_AddRef( &hIC->hdr ); lpwfs->hdr.dwFlags = dwFlags; lpwfs->hdr.dwContext = dwContext; lpwfs->hdr.dwInternalFlags = dwInternalFlags; @@ -2730,8 +2728,6 @@ BOOL WINAPI FTP_FindNextFileW(LPWININETF /* Clear any error information */ INTERNET_SetLastError(0); - assert(lpwh->hdr.lpwhparent->htype == WH_HFTPSESSION); - lpFindFileData = (LPWIN32_FIND_DATAW) lpvFindData; ZeroMemory(lpFindFileData, sizeof(WIN32_FIND_DATAA)); @@ -2856,7 +2852,6 @@ static HINTERNET FTP_ReceiveFileList(LPW if (lpwfn) { lpwfn->hdr.htype = WH_HFTPFINDNEXT; - lpwfn->hdr.lpwhparent = WININET_AddRef( &lpwfs->hdr ); lpwfn->hdr.dwContext = dwContext; lpwfn->hdr.dwRefCount = 1; lpwfn->hdr.destroy = FTP_CloseFindNextHandle; diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 3ae442e..d9aee10 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1002,7 +1002,6 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(L goto lend; } lpwhr->hdr.htype = WH_HHTTPREQ; - lpwhr->hdr.lpwhparent = WININET_AddRef( &lpwhs->hdr ); lpwhr->hdr.dwFlags = dwFlags; lpwhr->hdr.dwContext = dwContext; lpwhr->hdr.dwRefCount = 1; @@ -2400,7 +2399,6 @@ HINTERNET HTTP_Connect(LPWININETAPPINFOW */ lpwhs->hdr.htype = WH_HHTTPSESSION; - lpwhs->hdr.lpwhparent = WININET_AddRef( &hIC->hdr ); lpwhs->hdr.dwFlags = dwFlags; lpwhs->hdr.dwContext = dwContext; lpwhs->hdr.dwInternalFlags = dwInternalFlags; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index dda7872..4f2256a 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -521,7 +521,6 @@ #undef FE memset(lpwai, 0, sizeof(WININETAPPINFOW)); lpwai->hdr.htype = WH_HINIT; - lpwai->hdr.lpwhparent = NULL; lpwai->hdr.dwFlags = dwFlags; lpwai->hdr.dwRefCount = 1; lpwai->hdr.destroy = INTERNET_CloseHandle; @@ -1027,8 +1026,6 @@ BOOL WINAPI InternetCloseHandle(HINTERNE INTERNET_STATUS_HANDLE_CLOSING, &hInternet, sizeof(HINTERNET)); - if( lpwh->lpwhparent ) - WININET_Release( lpwh->lpwhparent ); WININET_FreeHandle( hInternet ); WININET_Release( lpwh ); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 9b2fd1f..c57cef7 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -146,7 +146,6 @@ struct _WININETHANDLEHEADER DWORD dwRefCount; WININET_object_destructor destroy; INTERNET_STATUS_CALLBACK lpfnStatusCB; - struct _WININETHANDLEHEADER *lpwhparent; };

1 0

Jacek Caban : wininet: Store WININETFTPSESSIONW pointer in WININETFTPFILEW.
by Alexandre Julliard Oct. 30, 2006

Oct. 30, 2006

Module: wine Branch: master Commit: 550ffef212caedb0a886dfd53262e01f287111e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=550ffef212caedb0a886dfd53… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 29 18:55:15 2006 +0100 wininet: Store WININETFTPSESSIONW pointer in WININETFTPFILEW. --- dlls/wininet/ftp.c | 13 +++++++++---- dlls/wininet/internet.c | 4 ++-- dlls/wininet/internet.h | 9 ++++++--- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 12a6d80..06b0153 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1008,7 +1008,7 @@ HINTERNET FTP_FtpOpenFileW(LPWININETFTPS { INT nDataSocket; BOOL bSuccess = FALSE; - LPWININETFILE lpwh = NULL; + LPWININETFTPFILE lpwh = NULL; LPWININETAPPINFOW hIC = NULL; HINTERNET handle = NULL; @@ -1033,7 +1033,7 @@ HINTERNET FTP_FtpOpenFileW(LPWININETFTPS /* Get data socket to server */ if (bSuccess && FTP_GetDataSocket(lpwfs, &nDataSocket)) { - lpwh = HeapAlloc(GetProcessHeap(), 0, sizeof(WININETFILE)); + lpwh = HeapAlloc(GetProcessHeap(), 0, sizeof(WININETFTPFILE)); lpwh->hdr.htype = WH_HFILE; lpwh->hdr.dwFlags = dwFlags; lpwh->hdr.dwContext = dwContext; @@ -1043,6 +1043,9 @@ HINTERNET FTP_FtpOpenFileW(LPWININETFTPS lpwh->hdr.lpfnStatusCB = lpwfs->hdr.lpfnStatusCB; lpwh->nDataSocket = nDataSocket; lpwh->session_deleted = FALSE; + + WININET_AddRef( &lpwfs->hdr ); + lpwh->lpFtpSession = lpwfs; handle = WININET_AllocHandle( &lpwh->hdr ); if( !handle ) @@ -2800,12 +2803,14 @@ static void FTP_CloseFindNextHandle(LPWI */ static void FTP_CloseFileTransferHandle(LPWININETHANDLEHEADER hdr) { - LPWININETFILE lpwh = (LPWININETFILE) hdr; - LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) lpwh->hdr.lpwhparent; + LPWININETFTPFILE lpwh = (LPWININETFTPFILE) hdr; + LPWININETFTPSESSIONW lpwfs = lpwh->lpFtpSession; INT nResCode; TRACE("\n"); + WININET_Release(&lpwh->lpFtpSession->hdr); + if (!lpwh->session_deleted) lpwfs->download_in_progress = NULL; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index ebb581e..dda7872 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1703,7 +1703,7 @@ BOOL WINAPI InternetWriteFile(HINTERNET break; case WH_HFILE: - nSocket = ((LPWININETFILE)lpwh)->nDataSocket; + nSocket = ((LPWININETFTPFILE)lpwh)->nDataSocket; break; default: @@ -1745,7 +1745,7 @@ static BOOL INTERNET_ReadFile(LPWININETH case WH_HFILE: /* FIXME: FTP should use NETCON_ stuff */ - nSocket = ((LPWININETFILE)lpwh)->nDataSocket; + nSocket = ((LPWININETFTPFILE)lpwh)->nDataSocket; if (nSocket != -1) { int res = recv(nSocket, lpBuffer, dwNumOfBytesToRead, bWait ? MSG_WAITALL : 0); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index e7af552..9b2fd1f 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -202,22 +202,25 @@ typedef struct } WININETHTTPREQW, *LPWININETHTTPREQW; +struct _WININETFTPSESSIONW; + typedef struct { WININETHANDLEHEADER hdr; + struct _WININETFTPSESSIONW *lpFtpSession; BOOL session_deleted; int nDataSocket; -} WININETFILE, *LPWININETFILE; +} WININETFTPFILE, *LPWININETFTPFILE; -typedef struct +typedef struct _WININETFTPSESSIONW { WININETHANDLEHEADER hdr; WININETAPPINFOW *lpAppInfo; int sndSocket; int lstnSocket; int pasvSocket; /* data socket connected by us in case of passive FTP */ - LPWININETFILE download_in_progress; + LPWININETFTPFILE download_in_progress; struct sockaddr_in socketAddress; struct sockaddr_in lstnSocketAddress; LPWSTR lpszPassword;

1 0