wine-commits June 2011

wine-commits@winehq.org

2 participants
809 discussions

Jacek Caban : wininet: A small netconn_secure_verify code clean up.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: adf08d586d9bcb8b785c9342aec4ca34862e2199 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adf08d586d9bcb8b785c9342a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 10 14:47:48 2011 +0200 wininet: A small netconn_secure_verify code clean up. --- dlls/wininet/netconnection.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 4334d7f..6c67f28 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -333,12 +333,8 @@ static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) cert = (X509 *)psk_value(chain, i); if ((context = X509_to_cert_context(cert))) { - if (i == 0) - ret = CertAddCertificateContextToStore(store, context, - CERT_STORE_ADD_ALWAYS, &endCert); - else - ret = CertAddCertificateContextToStore(store, context, - CERT_STORE_ADD_ALWAYS, NULL); + ret = CertAddCertificateContextToStore(store, context, + CERT_STORE_ADD_ALWAYS, i ? NULL : &endCert); CertFreeCertificateContext(context); } }

1 0

Jacek Caban : wininet: Added dwError of INTERNET_STATUS_REQUEST_COMPLETE notifications tests.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: a664fa8041d46372de20660dd9877f00b0d91f1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a664fa8041d46372de20660dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 10 14:47:37 2011 +0200 wininet: Added dwError of INTERNET_STATUS_REQUEST_COMPLETE notifications tests. --- dlls/wininet/tests/http.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 13ac6f5..2110dec 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -103,6 +103,7 @@ static int expect[MAX_INTERNET_STATUS], optional[MAX_INTERNET_STATUS], static const char *status_string[MAX_INTERNET_STATUS]; static HANDLE hCompleteEvent, conn_close_event; +static DWORD req_error; #define TESTF_REDIRECT 0x01 #define TESTF_COMPRESSED 0x02 @@ -291,6 +292,7 @@ static VOID WINAPI callback( trace("%04x:Callback %p 0x%lx INTERNET_STATUS_REQUEST_COMPLETE {%ld,%d} %d\n", GetCurrentThreadId(), hInternet, dwContext, iar->dwResult,iar->dwError,dwStatusInformationLength); + req_error = iar->dwError; SetEvent(hCompleteEvent); break; } @@ -448,8 +450,10 @@ static void InternetReadFile_test(int flags, const test_data_t *test) "Synchronous HttpSendRequest returning 0, error %u\n", GetLastError()); trace("HttpSendRequestA <--\n"); - if (flags & INTERNET_FLAG_ASYNC) + if (flags & INTERNET_FLAG_ASYNC) { WaitForSingleObject(hCompleteEvent, INFINITE); + ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); + } HeapFree(GetProcessHeap(), 0, post_data); if(test->flags & TESTF_ALLOW_COOKIE) { @@ -550,6 +554,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) ok(!length, "InternetQueryDataAvailable returned ERROR_IO_PENDING and %u length\n", length); WaitForSingleObject(hCompleteEvent, INFINITE); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + ok(req_error, "req_error = 0\n"); continue; }else { ok(0, "InternetQueryDataAvailable failed: %u\n", GetLastError()); @@ -788,8 +793,10 @@ static void InternetReadFileExA_test(int flags) "Synchronous HttpSendRequest returning 0, error %u\n", GetLastError()); trace("HttpSendRequestA <--\n"); - if (!rc && (GetLastError() == ERROR_IO_PENDING)) + if (!rc && (GetLastError() == ERROR_IO_PENDING)) { WaitForSingleObject(hCompleteEvent, INFINITE); + ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); + } if (first_connection_to_test_url) { @@ -880,6 +887,7 @@ static void InternetReadFileExA_test(int flags) WaitForSingleObject(hCompleteEvent, INFINITE); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); CHECK_NOT_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); + ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); } else { @@ -2166,6 +2174,7 @@ static void test_no_content(int port) ok(!res && (GetLastError() == ERROR_IO_PENDING), "Asynchronous HttpSendRequest NOT returning 0 with error ERROR_IO_PENDING\n"); WaitForSingleObject(hCompleteEvent, INFINITE); + ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); @@ -2223,6 +2232,7 @@ static void test_conn_close(int port) ok(!res && (GetLastError() == ERROR_IO_PENDING), "Asynchronous HttpSendRequest NOT returning 0 with error ERROR_IO_PENDING\n"); WaitForSingleObject(hCompleteEvent, INFINITE); + ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); @@ -2252,6 +2262,7 @@ static void test_conn_close(int port) SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); SetEvent(conn_close_event); WaitForSingleObject(hCompleteEvent, INFINITE); + ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE);

1 0

Jacek Caban : wininet: Set content_length when we reach end of data in netconn_read.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: cfdc539972f8e0a69b8f2cfc13a089e6488a3897 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfdc539972f8e0a69b8f2cfc1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 10 14:47:27 2011 +0200 wininet: Set content_length when we reach end of data in netconn_read. --- dlls/wininet/http.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 520d17c..f8386b8 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2346,6 +2346,8 @@ static DWORD netconn_read(data_stream_t *stream, http_request_t *req, BYTE *buf, if(size && req->netconn) { if(NETCON_recv(req->netconn, buf, size, read_mode == READMODE_SYNC ? MSG_WAITALL : 0, &len) != ERROR_SUCCESS) len = 0; + if(!len) + netconn_stream->content_length = netconn_stream->content_read; } netconn_stream->content_read += *read = len;

1 0

Jacek Caban : wininet: Don' t pass handle to INTERNET_REQUEST_COMPLETE unless the request is opened via InternetPoenUrl .
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 8e37ed551a15146980e7092820d9c5f526237897 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e37ed551a15146980e709282… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 10 14:47:16 2011 +0200 wininet: Don't pass handle to INTERNET_REQUEST_COMPLETE unless the request is opened via InternetPoenUrl. --- dlls/wininet/http.c | 17 +++++++++++------ dlls/wininet/tests/http.c | 1 + 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 21c4125..520d17c 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2660,7 +2660,7 @@ static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif) } if(res == ERROR_SUCCESS) - send_request_complete(req, (DWORD_PTR)req->hdr.hInternet, avail); + send_request_complete(req, req->session->hdr.dwInternalFlags & INET_OPENURL ? (DWORD_PTR)req->hdr.hInternet : 1, avail); else send_request_complete(req, 0, res); } @@ -4805,10 +4805,15 @@ lend: if (request->session->appInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - if (res == ERROR_SUCCESS && request->contentLength && request->bytesWritten == request->bytesToWrite) - HTTP_ReceiveRequestData(request, TRUE); - else - send_request_complete(request, res == ERROR_SUCCESS ? (DWORD_PTR)request->hdr.hInternet : 0, res); + if (res == ERROR_SUCCESS) { + if(request->contentLength && request->bytesWritten == request->bytesToWrite) + HTTP_ReceiveRequestData(request, TRUE); + else + send_request_complete(request, + request->session->hdr.dwInternalFlags & INET_OPENURL ? (DWORD_PTR)request->hdr.hInternet : 1, 0); + }else { + send_request_complete(request, 0, res); + } } TRACE("<--\n"); @@ -4902,7 +4907,7 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ if (res == ERROR_SUCCESS && request->contentLength) HTTP_ReceiveRequestData(request, TRUE); else - send_request_complete(request, res == ERROR_SUCCESS ? (DWORD_PTR)request->hdr.hInternet : 0, res); + send_request_complete(request, res == ERROR_SUCCESS, res); return res; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 5db7f64..13ac6f5 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -287,6 +287,7 @@ static VOID WINAPI callback( ok(dwStatusInformationLength == sizeof(INTERNET_ASYNC_RESULT), "info length should be sizeof(INTERNET_ASYNC_RESULT) instead of %d\n", dwStatusInformationLength); + ok(iar->dwResult == 1 || iar->dwResult == 0, "iar->dwResult = %ld\n", iar->dwResult); trace("%04x:Callback %p 0x%lx INTERNET_STATUS_REQUEST_COMPLETE {%ld,%d} %d\n", GetCurrentThreadId(), hInternet, dwContext, iar->dwResult,iar->dwError,dwStatusInformationLength);

1 0

Jacek Caban : wininet: Moved INTERNET_STATUS_REQUEST_COMPLETE notifications sending to separated function .
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: c0293df46a21c54aeec50ce10c5a85ad3e13fc0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0293df46a21c54aeec50ce10… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 10 14:47:04 2011 +0200 wininet: Moved INTERNET_STATUS_REQUEST_COMPLETE notifications sending to separated function. --- dlls/wininet/http.c | 68 ++++++++++++++++++-------------------------------- 1 files changed, 25 insertions(+), 43 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 559323d..21c4125 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2627,10 +2627,20 @@ static DWORD set_content_length(http_request_t *request, DWORD status_code) return ERROR_SUCCESS; } -static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif) +static void send_request_complete(http_request_t *req, DWORD_PTR result, DWORD error) { INTERNET_ASYNC_RESULT iar; - DWORD res, read = 0; + + iar.dwResult = result; + iar.dwError = error; + + INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_REQUEST_COMPLETE, &iar, + sizeof(INTERNET_ASYNC_RESULT)); +} + +static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif) +{ + DWORD res, read = 0, avail = 0; read_mode_t mode; TRACE("%p\n", req); @@ -2639,13 +2649,8 @@ static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif) mode = first_notif && req->read_size ? READMODE_NOBLOCK : READMODE_ASYNC; res = refill_read_buffer(req, mode, &read); - if(res == ERROR_SUCCESS) { - iar.dwResult = (DWORD_PTR)req->hdr.hInternet; - iar.dwError = first_notif ? 0 : get_avail_data(req); - }else { - iar.dwResult = 0; - iar.dwError = res; - } + if(res == ERROR_SUCCESS && !first_notif) + avail = get_avail_data(req); LeaveCriticalSection( &req->read_section ); @@ -2654,8 +2659,10 @@ static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif) http_release_netconn(req, FALSE); } - INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_REQUEST_COMPLETE, &iar, - sizeof(INTERNET_ASYNC_RESULT)); + if(res == ERROR_SUCCESS) + send_request_complete(req, (DWORD_PTR)req->hdr.hInternet, avail); + else + send_request_complete(req, 0, res); } /* read data from the http connection (the read section must be held) */ @@ -2725,7 +2732,6 @@ static void HTTPREQ_AsyncReadFileExAProc(WORKREQUEST *workRequest) { struct WORKREQ_INTERNETREADFILEEXA const *data = &workRequest->u.InternetReadFileExA; http_request_t *req = (http_request_t*)workRequest->hdr; - INTERNET_ASYNC_RESULT iar; DWORD res; TRACE("INTERNETREADFILEEXA %p\n", workRequest->hdr); @@ -2733,12 +2739,7 @@ static void HTTPREQ_AsyncReadFileExAProc(WORKREQUEST *workRequest) res = HTTPREQ_Read(req, data->lpBuffersOut->lpvBuffer, data->lpBuffersOut->dwBufferLength, &data->lpBuffersOut->dwBufferLength, TRUE); - iar.dwResult = res == ERROR_SUCCESS; - iar.dwError = res; - - INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, - INTERNET_STATUS_REQUEST_COMPLETE, &iar, - sizeof(INTERNET_ASYNC_RESULT)); + send_request_complete(req, res == ERROR_SUCCESS, res); } static DWORD HTTPREQ_ReadFileExA(object_header_t *hdr, INTERNET_BUFFERSA *buffers, @@ -2832,7 +2833,6 @@ static void HTTPREQ_AsyncReadFileExWProc(WORKREQUEST *workRequest) { struct WORKREQ_INTERNETREADFILEEXW const *data = &workRequest->u.InternetReadFileExW; http_request_t *req = (http_request_t*)workRequest->hdr; - INTERNET_ASYNC_RESULT iar; DWORD res; TRACE("INTERNETREADFILEEXW %p\n", workRequest->hdr); @@ -2840,12 +2840,7 @@ static void HTTPREQ_AsyncReadFileExWProc(WORKREQUEST *workRequest) res = HTTPREQ_Read(req, data->lpBuffersOut->lpvBuffer, data->lpBuffersOut->dwBufferLength, &data->lpBuffersOut->dwBufferLength, TRUE); - iar.dwResult = res == ERROR_SUCCESS; - iar.dwError = res; - - INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, - INTERNET_STATUS_REQUEST_COMPLETE, &iar, - sizeof(INTERNET_ASYNC_RESULT)); + send_request_complete(req, res == ERROR_SUCCESS, res); } static DWORD HTTPREQ_ReadFileExW(object_header_t *hdr, INTERNET_BUFFERSW *buffers, @@ -4539,7 +4534,6 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, LPWSTR requestString = NULL; INT responseLen; BOOL loop_next; - INTERNET_ASYNC_RESULT iar; static const WCHAR szPost[] = { 'P','O','S','T',0 }; static const WCHAR szContentLength[] = { 'C','o','n','t','e','n','t','-','L','e','n','g','t','h',':',' ','%','l','i','\r','\n',0 }; @@ -4814,14 +4808,7 @@ lend: if (res == ERROR_SUCCESS && request->contentLength && request->bytesWritten == request->bytesToWrite) HTTP_ReceiveRequestData(request, TRUE); else - { - iar.dwResult = (res==ERROR_SUCCESS ? (DWORD_PTR)request->hdr.hInternet : 0); - iar.dwError = res; - - INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, - INTERNET_STATUS_REQUEST_COMPLETE, &iar, - sizeof(INTERNET_ASYNC_RESULT)); - } + send_request_complete(request, res == ERROR_SUCCESS ? (DWORD_PTR)request->hdr.hInternet : 0, res); } TRACE("<--\n"); @@ -4912,15 +4899,10 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ } } - if (res == ERROR_SUCCESS && request->contentLength) { + if (res == ERROR_SUCCESS && request->contentLength) HTTP_ReceiveRequestData(request, TRUE); - }else { - INTERNET_ASYNC_RESULT iar = {0, res}; - - INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, - INTERNET_STATUS_REQUEST_COMPLETE, &iar, - sizeof(INTERNET_ASYNC_RESULT)); - } + else + send_request_complete(request, res == ERROR_SUCCESS ? (DWORD_PTR)request->hdr.hInternet : 0, res); return res; } @@ -4975,7 +4957,7 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hRequest, http_request_t *request; DWORD res; - TRACE("-->\n"); + TRACE("%p %p %x %lx -->\n", hRequest, lpBuffersOut, dwFlags, dwContext); if (lpBuffersOut) {

1 0

Ričardas Barkauskas : ddraw: Separate IDirectDrawSurface vtable.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: f3ae1b99f637c7a22546a7528edb0f9df2d57678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3ae1b99f637c7a22546a7528… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Thu Jun 9 18:29:36 2011 +0300 ddraw: Separate IDirectDrawSurface vtable. --- dlls/ddraw/ddraw.c | 24 ++-- dlls/ddraw/ddraw_private.h | 6 + dlls/ddraw/device.c | 2 +- dlls/ddraw/surface.c | 419 +++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 432 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f3ae1b99f637c7a22546a…

1 0

Ričardas Barkauskas : ddraw: Use unsafe_impl_from_IDirectDrawSurface() for application provided interfaces.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 27063ffeaab30b00fd89038fe029b1a49ff36d9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=27063ffeaab30b00fd89038fe… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Thu Jun 9 17:40:19 2011 +0300 ddraw: Use unsafe_impl_from_IDirectDrawSurface() for application provided interfaces. --- dlls/ddraw/ddraw.c | 8 ++++---- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 2 +- dlls/ddraw/surface.c | 7 +++++++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index df74def..648c63d 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4266,7 +4266,7 @@ static HRESULT WINAPI ddraw3_DuplicateSurface(IDirectDraw3 *iface, IDirectDrawSu IDirectDrawSurface **dst) { IDirectDrawImpl *This = impl_from_IDirectDraw3(iface); - IDirectDrawSurfaceImpl *src_impl = unsafe_impl_from_IDirectDrawSurface3((IDirectDrawSurface3 *)src); + IDirectDrawSurfaceImpl *src_impl = unsafe_impl_from_IDirectDrawSurface(src); IDirectDrawSurface7 *dst7; IDirectDrawSurfaceImpl *dst_impl; HRESULT hr; @@ -4286,7 +4286,7 @@ static HRESULT WINAPI ddraw2_DuplicateSurface(IDirectDraw2 *iface, IDirectDrawSurface *src, IDirectDrawSurface **dst) { IDirectDrawImpl *This = impl_from_IDirectDraw2(iface); - IDirectDrawSurfaceImpl *src_impl = unsafe_impl_from_IDirectDrawSurface3((IDirectDrawSurface3 *)src); + IDirectDrawSurfaceImpl *src_impl = unsafe_impl_from_IDirectDrawSurface(src); IDirectDrawSurface7 *dst7; IDirectDrawSurfaceImpl *dst_impl; HRESULT hr; @@ -4306,7 +4306,7 @@ static HRESULT WINAPI ddraw1_DuplicateSurface(IDirectDraw *iface, IDirectDrawSur IDirectDrawSurface **dst) { IDirectDrawImpl *This = impl_from_IDirectDraw(iface); - IDirectDrawSurfaceImpl *src_impl = unsafe_impl_from_IDirectDrawSurface3((IDirectDrawSurface3 *)src); + IDirectDrawSurfaceImpl *src_impl = unsafe_impl_from_IDirectDrawSurface(src); IDirectDrawSurface7 *dst7; IDirectDrawSurfaceImpl *dst_impl; HRESULT hr; @@ -4906,7 +4906,7 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid, IDirectDrawSurface *surface, IDirect3DDevice2 **device) { IDirectDrawImpl *This = impl_from_IDirect3D2(iface); - IDirectDrawSurfaceImpl *surface_impl = unsafe_impl_from_IDirectDrawSurface3((IDirectDrawSurface3 *)surface); + IDirectDrawSurfaceImpl *surface_impl = unsafe_impl_from_IDirectDrawSurface(surface); HRESULT hr; TRACE("iface %p, riid %s, surface %p, device %p.\n", diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index bce6368..160ae44 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -242,6 +242,7 @@ static inline IDirectDrawSurfaceImpl *impl_from_IDirectDrawSurface7(IDirectDrawS return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawSurface7_iface); } +IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface(IDirectDrawSurface *iface) DECLSPEC_HIDDEN; IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface2(IDirectDrawSurface2 *iface) DECLSPEC_HIDDEN; IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawSurface3 *iface) DECLSPEC_HIDDEN; IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface4(IDirectDrawSurface4 *iface) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index f4e5664..c4ad855 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1901,7 +1901,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_SetRenderTarget(IDirect3DDevice2 *if IDirectDrawSurface *NewRenderTarget, DWORD Flags) { IDirect3DDeviceImpl *This = device_from_device2(iface); - IDirectDrawSurfaceImpl *Target = unsafe_impl_from_IDirectDrawSurface3((IDirectDrawSurface3 *)NewRenderTarget); + IDirectDrawSurfaceImpl *Target = unsafe_impl_from_IDirectDrawSurface(NewRenderTarget); TRACE("iface %p, target %p, flags %#x.\n", iface, NewRenderTarget, Flags); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e877b9f..eb9dd29 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4421,6 +4421,13 @@ IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface2(IDirectDrawSurface2 return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawSurface2_iface); } +IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface(IDirectDrawSurface *iface) +{ + if (!iface) return NULL; + assert(iface->lpVtbl == (struct IDirectDrawSurfaceVtbl *)&ddraw_surface3_vtbl); + return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawSurface3_iface); +} + static void STDMETHODCALLTYPE ddraw_surface_wined3d_object_destroyed(void *parent) { IDirectDrawSurfaceImpl *surface = parent;

1 0

Ričardas Barkauskas : ddraw: Separate IDirectDrawSurface2 vtable.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: a8ee7c5e00d7de1060857ff8d779ee8480b30b16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8ee7c5e00d7de1060857ff8d… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Thu Jun 9 17:35:15 2011 +0300 ddraw: Separate IDirectDrawSurface2 vtable. --- dlls/ddraw/ddraw_private.h | 7 + dlls/ddraw/surface.c | 446 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 452 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8ee7c5e00d7de1060857…

1 0

Louis Lenders : netapi32/tests: Add small conformance test for NetGetJoinInformation.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 6f08c7e97916684450e642a6c5e2207f296e7a4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f08c7e97916684450e642a6c… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Jun 10 10:41:50 2011 +0200 netapi32/tests: Add small conformance test for NetGetJoinInformation. --- dlls/netapi32/tests/wksta.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/netapi32/tests/wksta.c b/dlls/netapi32/tests/wksta.c index fff5b48..54c25e5 100644 --- a/dlls/netapi32/tests/wksta.c +++ b/dlls/netapi32/tests/wksta.c @@ -31,6 +31,7 @@ #include "lmerr.h" #include "lmwksta.h" #include "lmapibuf.h" +#include "lmjoin.h" static NET_API_STATUS (WINAPI *pNetApiBufferFree)(LPVOID)=NULL; static NET_API_STATUS (WINAPI *pNetApiBufferSize)(LPVOID,LPDWORD)=NULL; @@ -38,6 +39,7 @@ static NET_API_STATUS (WINAPI *pNetpGetComputerName)(LPWSTR*)=NULL; static NET_API_STATUS (WINAPI *pNetWkstaUserGetInfo)(LPWSTR,DWORD,PBYTE*)=NULL; static NET_API_STATUS (WINAPI *pNetWkstaTransportEnum)(LPWSTR,DWORD,LPBYTE*, DWORD,LPDWORD,LPDWORD,LPDWORD)=NULL; +static NET_API_STATUS (WINAPI *pNetGetJoinInformation)(LPCWSTR,LPWSTR*,PNETSETUP_JOIN_STATUS); static WCHAR user_name[UNLEN + 1]; static WCHAR computer_name[MAX_COMPUTERNAME_LENGTH + 1]; @@ -179,6 +181,28 @@ static void run_wkstatransportenum_tests(void) } } +static void run_wkstajoininfo_tests(void) +{ + NET_API_STATUS ret; + LPWSTR buffer = NULL; + NETSETUP_JOIN_STATUS buffertype = 0xdada; + /* NT4 doesn't have this function */ + if (!pNetGetJoinInformation) { + win_skip("NetGetJoinInformation not available\n"); + return; + } + + ret = pNetGetJoinInformation(NULL, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "NetJoinGetInformation returned unexpected 0x%08x\n", ret); + ok(buffertype == 0xdada, "buffertype set to unexpected value %d\n", buffertype); + + ret = pNetGetJoinInformation(NULL, &buffer, &buffertype); + ok(ret == NERR_Success, "NetJoinGetInformation returned unexpected 0x%08x\n", ret); + ok(buffertype != 0xdada && buffertype != NetSetupUnknownStatus, "buffertype set to unexpected value %d\n", buffertype); + trace("workstation joined to %s with status %d\n", wine_dbgstr_w(buffer), buffertype); + pNetApiBufferFree(buffer); +} + START_TEST(wksta) { HMODULE hnetapi32=LoadLibraryA("netapi32.dll"); @@ -188,6 +212,7 @@ START_TEST(wksta) pNetpGetComputerName=(void*)GetProcAddress(hnetapi32,"NetpGetComputerName"); pNetWkstaUserGetInfo=(void*)GetProcAddress(hnetapi32,"NetWkstaUserGetInfo"); pNetWkstaTransportEnum=(void*)GetProcAddress(hnetapi32,"NetWkstaTransportEnum"); + pNetGetJoinInformation=(void*)GetProcAddress(hnetapi32,"NetGetJoinInformation"); /* These functions were introduced with NT. It's safe to assume that * if one is not available, none are. @@ -205,6 +230,7 @@ START_TEST(wksta) win_skip("Function NetpGetComputerName not available\n"); run_wkstausergetinfo_tests(); run_wkstatransportenum_tests(); + run_wkstajoininfo_tests(); } FreeLibrary(hnetapi32);

1 0

Louis Lenders : netapi32: Improve stubbed NetGetJoinInformation function.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: ed28cab62488d58a8e2d6d4c675b548512f1f230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed28cab62488d58a8e2d6d4c6… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Jun 10 11:06:53 2011 +0200 netapi32: Improve stubbed NetGetJoinInformation function. --- dlls/netapi32/wksta.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/netapi32/wksta.c b/dlls/netapi32/wksta.c index ad8d87e..ba2f628 100644 --- a/dlls/netapi32/wksta.c +++ b/dlls/netapi32/wksta.c @@ -584,10 +584,16 @@ NET_API_STATUS NET_API_FUNCTION NetGetJoinInformation( LPWSTR *Name, PNETSETUP_JOIN_STATUS type) { - FIXME("Stub %s %p %p\n", wine_dbgstr_w(Server), Name, type); + static const WCHAR workgroupW[] = {'W','o','r','k','g','r','o','u','p',0}; - *Name = NULL; - *type = NetSetupUnknownStatus; + FIXME("Semi-stub %s %p %p\n", wine_dbgstr_w(Server), Name, type); + + if (!Name || !type) + return ERROR_INVALID_PARAMETER; + + NetApiBufferAllocate(sizeof(workgroupW), (LPVOID *)Name); + lstrcpyW(*Name, workgroupW); + *type = NetSetupWorkgroupName; return NERR_Success; }

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2011