June 2011 - Wine-Commits - list.winehq.org

Mariusz Pluciński : shell32/tests: Basic tests of IKnownFolderManager.
by Alexandre Julliard June 10, 2011

June 10, 2011

Module: wine Branch: master Commit: ab23dca7e9546a5e0f0e14a3fade6cd9ac93e3a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab23dca7e9546a5e0f0e14a3f… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu Jun 9 10:40:02 2011 +0200 shell32/tests: Basic tests of IKnownFolderManager. --- dlls/shell32/tests/shellpath.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index d81ce80..7e77b25 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -883,6 +883,37 @@ if (0) { /* crashes */ ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); } +static void test_knownFolders(void) +{ + HRESULT hr; + IKnownFolderManager *mgr = NULL; + KNOWNFOLDERID folderId; + int csidl; + + CoInitialize(NULL); + + hr = CoCreateInstance(&CLSID_KnownFolderManager, NULL, CLSCTX_INPROC_SERVER, + &IID_IKnownFolderManager, (LPVOID*)&mgr); + if(hr == REGDB_E_CLASSNOTREG) + win_skip("IKnownFolderManager unavailable\n"); + else + { + ok(hr == S_OK, "failed to create KnownFolderManager instance: 0x%08x\n", hr); + + hr = IKnownFolderManager_FolderIdFromCsidl(mgr, CSIDL_WINDOWS, &folderId); + ok(hr == S_OK, "failed to convert CSIDL to KNOWNFOLDERID: 0x%08x\n", hr); + ok(IsEqualGUID(&folderId, &FOLDERID_Windows)==TRUE, "invalid KNOWNFOLDERID returned\n"); + + hr = IKnownFolderManager_FolderIdToCsidl(mgr, &FOLDERID_Windows, &csidl); + ok(hr == S_OK, "failed to convert CSIDL to KNOWNFOLDERID: 0x%08x\n", hr); + ok(csidl == CSIDL_WINDOWS, "invalid CSIDL returned\n"); + + hr = IKnownFolderManager_Release(mgr); + ok(hr == S_OK, "failed to release KnownFolderManager instance: 0x%08x\n", hr); + } + CoUninitialize(); +} + START_TEST(shellpath) { if (!init()) return; @@ -909,5 +940,6 @@ START_TEST(shellpath) testSystemDir(); test_NonExistentPath(); test_SHGetFolderPathEx(); + test_knownFolders(); } }

1 0

Mariusz Pluciński : shell32/tests: Basic tests of IKnownFolder.
by Alexandre Julliard June 10, 2011

June 10, 2011

Module: wine Branch: master Commit: 17aeb550bf8c59fb7e68dda4ee1181fe3fe0b1f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17aeb550bf8c59fb7e68dda4e… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu Jun 9 10:40:44 2011 +0200 shell32/tests: Basic tests of IKnownFolder. --- dlls/shell32/tests/shellpath.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 7e77b25..2a1c436 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -887,8 +887,15 @@ static void test_knownFolders(void) { HRESULT hr; IKnownFolderManager *mgr = NULL; + IKnownFolder *folder = NULL; KNOWNFOLDERID folderId; + KF_CATEGORY cat = 0; int csidl; + LPWSTR folderPath; + KF_REDIRECTION_CAPABILITIES redirectionCapabilities = 1; + WCHAR sWinDir[MAX_PATH]; + + GetWindowsDirectoryW( sWinDir, MAX_PATH ); CoInitialize(NULL); @@ -908,6 +915,38 @@ static void test_knownFolders(void) ok(hr == S_OK, "failed to convert CSIDL to KNOWNFOLDERID: 0x%08x\n", hr); ok(csidl == CSIDL_WINDOWS, "invalid CSIDL returned\n"); + hr = IKnownFolderManager_GetFolder(mgr, &FOLDERID_Windows, &folder); + ok(hr == S_OK, "failed to get known folder: 0x%08x\n", hr); + if(SUCCEEDED(hr)) + { + hr = IKnownFolder_GetCategory(folder, &cat); + todo_wine + ok(hr == S_OK, "failed to get folder category: 0x%08x\n", hr); + todo_wine + ok(cat==KF_CATEGORY_FIXED, "invalid folder category: %d\n", cat); + + hr = IKnownFolder_GetId(folder, &folderId); + ok(hr == S_OK, "failed to get folder id: 0x%08x\n", hr); + ok(IsEqualGUID(&folderId, &FOLDERID_Windows)==TRUE, "invalid KNOWNFOLDERID returned\n"); + + hr = IKnownFolder_GetPath(folder, 0, &folderPath); + ok(lstrcmpiW(sWinDir, folderPath)==0, "invalid path returned: \"%s\", expected: \"%s\"\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sWinDir)); + CoTaskMemFree(folderPath); + + hr = IKnownFolder_GetRedirectionCapabilities(folder, &redirectionCapabilities); + todo_wine + ok(hr == S_OK, "failed to get redirection capabilities: 0x%08x\n", hr); + todo_wine + ok(redirectionCapabilities==0, "invalid redirection capabilities returned: %d\n", redirectionCapabilities); + + hr = IKnownFolder_SetPath(folder, 0, sWinDir); + todo_wine + ok(hr == E_INVALIDARG, "unexpected value from SetPath: 0x%08x\n", hr); + + hr = IKnownFolder_Release(folder); + ok(hr == S_OK, "failed to release KnownFolder instance: 0x%08x\n", hr); + } + hr = IKnownFolderManager_Release(mgr); ok(hr == S_OK, "failed to release KnownFolderManager instance: 0x%08x\n", hr); }

1 0

Jacek Caban : wininet: A small netconn_secure_verify code clean up.
by Alexandre Julliard June 10, 2011

June 10, 2011

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

Mariusz Pluciński : include: Add definition of inline function FreeKnownFolderDefinitionFields.
by Alexandre Julliard June 10, 2011

June 10, 2011

Module: wine Branch: master Commit: 3ea1fa170c28803449570c7ce8b4bbe1e5398608 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ea1fa170c28803449570c7ce… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu Jun 9 10:40:55 2011 +0200 include: Add definition of inline function FreeKnownFolderDefinitionFields. --- include/shobjidl.idl | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index c4eac65..86f5ecb 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -3058,6 +3058,19 @@ interface IKnownFolderManager : IUnknown [out, string] LPWSTR *ppszError); } +/* function for releasing structure returned from IKnownFolder::GetFolderDefinition */ +cpp_quote("static inline void FreeKnownFolderDefinitionFields(KNOWNFOLDER_DEFINITION *pKFD)") +cpp_quote("{") +cpp_quote(" CoTaskMemFree(pKFD->pszName);") +cpp_quote(" CoTaskMemFree(pKFD->pszDescription);") +cpp_quote(" CoTaskMemFree(pKFD->pszRelativePath);") +cpp_quote(" CoTaskMemFree(pKFD->pszParsingName);") +cpp_quote(" CoTaskMemFree(pKFD->pszTooltip);") +cpp_quote(" CoTaskMemFree(pKFD->pszLocalizedName);") +cpp_quote(" CoTaskMemFree(pKFD->pszIcon);") +cpp_quote(" CoTaskMemFree(pKFD->pszSecurity);") +cpp_quote("}") + /***************************************************************************** * ShellObjects typelibrary */

1 0

Jacek Caban : wininet: Moved INTERNET_STATUS_REQUEST_COMPLETE notifications sending to separated function .
by Alexandre Julliard June 10, 2011

June 10, 2011

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: Use unsafe_impl_from_IDirectDrawSurface() for application provided interfaces.
by Alexandre Julliard June 10, 2011

June 10, 2011

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

Alexandre Julliard : rpcrt4: Fix parameter stack size computation in the old-style stubless marshaller.
by Alexandre Julliard June 10, 2011

June 10, 2011

Module: wine Branch: master Commit: 87cf6ec75d5a2822d1f0af7fd7f3037262a3406b URL: http://source.winehq.org/git/wine.git/?a=commit;h=87cf6ec75d5a2822d1f0af7fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 7 20:44:16 2011 +0200 rpcrt4: Fix parameter stack size computation in the old-style stubless marshaller. --- dlls/rpcrt4/ndr_stubless.c | 42 +++++++++++++++--------------------------- 1 files changed, 15 insertions(+), 27 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 64b5f12..173ff61 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -412,26 +412,23 @@ static unsigned int type_stack_size(unsigned char fc) case RPC_FC_CHAR: case RPC_FC_SMALL: case RPC_FC_USMALL: - return sizeof(char); case RPC_FC_WCHAR: case RPC_FC_SHORT: case RPC_FC_USHORT: - return sizeof(short); case RPC_FC_LONG: case RPC_FC_ULONG: + case RPC_FC_INT3264: + case RPC_FC_UINT3264: case RPC_FC_ENUM16: case RPC_FC_ENUM32: - return sizeof(int); case RPC_FC_FLOAT: - return sizeof(float); + case RPC_FC_ERROR_STATUS_T: + case RPC_FC_IGNORE: + return sizeof(void *); case RPC_FC_DOUBLE: return sizeof(double); case RPC_FC_HYPER: return sizeof(ULONGLONG); - case RPC_FC_ERROR_STATUS_T: - return sizeof(error_status_t); - case RPC_FC_IGNORE: - return sizeof(void *); default: ERR("invalid base type 0x%x\n", fc); RpcRaiseException(RPC_S_INTERNAL_ERROR); @@ -463,7 +460,7 @@ void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, /* current format string offset */ int current_offset = 0; /* current stack offset */ - unsigned short current_stack_offset = 0; + unsigned short current_stack_offset = object_proc ? sizeof(void *) : 0; /* counter */ unsigned short i; @@ -475,19 +472,15 @@ void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, { const NDR_PARAM_OI_BASETYPE *pParam = (const NDR_PARAM_OI_BASETYPE *)&pFormat[current_offset]; - /* note: current_stack_offset starts after the This pointer - * if present, so adjust this */ - unsigned short current_stack_offset_adjusted = current_stack_offset + - (object_proc ? sizeof(void *) : 0); - unsigned char * pArg = ARG_FROM_OFFSET(args, current_stack_offset_adjusted); + unsigned char * pArg = ARG_FROM_OFFSET(args, current_stack_offset); /* no more parameters; exit loop */ - if (current_stack_offset_adjusted >= stack_size) + if (current_stack_offset >= stack_size) break; TRACE("param[%d]: old format\n", i); TRACE("\tparam_direction: 0x%x\n", pParam->param_direction); - TRACE("\tstack_offset: 0x%x\n", current_stack_offset_adjusted); + TRACE("\tstack_offset: 0x%x\n", current_stack_offset); TRACE("\tmemory addr (before): %p\n", pArg); if (pParam->param_direction == RPC_FC_IN_PARAM_BASETYPE || @@ -567,10 +560,9 @@ void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, RpcRaiseException(RPC_S_INTERNAL_ERROR); } - current_stack_offset += pParamOther->stack_size * sizeof(INT); + current_stack_offset += pParamOther->stack_size * sizeof(void *); current_offset += sizeof(NDR_PARAM_OI_OTHER); } - TRACE("\tmemory addr (after): %p\n", pArg); } } @@ -1242,7 +1234,7 @@ static LONG_PTR *stub_do_old_args(MIDL_STUB_MESSAGE *pStubMsg, /* current format string offset */ int current_offset = 0; /* current stack offset */ - unsigned short current_stack_offset = 0; + unsigned short current_stack_offset = object ? sizeof(void *) : 0; /* location to put retval into */ LONG_PTR *retval_ptr = NULL; @@ -1250,19 +1242,15 @@ static LONG_PTR *stub_do_old_args(MIDL_STUB_MESSAGE *pStubMsg, { const NDR_PARAM_OI_BASETYPE *pParam = (const NDR_PARAM_OI_BASETYPE *)&pFormat[current_offset]; - /* note: current_stack_offset starts after the This pointer - * if present, so adjust this */ - unsigned short current_stack_offset_adjusted = current_stack_offset + - (object ? sizeof(void *) : 0); - unsigned char *pArg = args + current_stack_offset_adjusted; + unsigned char *pArg = args + current_stack_offset; /* no more parameters; exit loop */ - if (current_stack_offset_adjusted >= stack_size) + if (current_stack_offset >= stack_size) break; TRACE("param[%d]: old format\n", i); TRACE("\tparam_direction: 0x%x\n", pParam->param_direction); - TRACE("\tstack_offset: 0x%x\n", current_stack_offset_adjusted); + TRACE("\tstack_offset: 0x%x\n", current_stack_offset); if (pParam->param_direction == RPC_FC_IN_PARAM_BASETYPE || pParam->param_direction == RPC_FC_RETURN_PARAM_BASETYPE) @@ -1372,7 +1360,7 @@ static LONG_PTR *stub_do_old_args(MIDL_STUB_MESSAGE *pStubMsg, RpcRaiseException(RPC_S_INTERNAL_ERROR); } - current_stack_offset += pParamOther->stack_size * sizeof(INT); + current_stack_offset += pParamOther->stack_size * sizeof(void *); current_offset += sizeof(NDR_PARAM_OI_OTHER); } }

1 0

Ričardas Barkauskas : ddraw: Separate IDirectDrawSurface vtable.
by Alexandre Julliard June 10, 2011

June 10, 2011

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

Alexandre Julliard : rpcrt4: Don't try to bind to a null handle.
by Alexandre Julliard June 10, 2011

June 10, 2011

Module: wine Branch: master Commit: cdf457774d4310c6af65af69472a5090fbcd93d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdf457774d4310c6af65af694… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 9 17:45:14 2011 +0200 rpcrt4: Don't try to bind to a null handle. --- dlls/rpcrt4/ndr_stubless.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index f7bd670..0f54211 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -191,14 +191,14 @@ static PFORMAT_STRING client_get_handle( } else context_handle = *(NDR_CCONTEXT *)ARG_FROM_OFFSET(pStubMsg->StackTop, pDesc->offset); - if ((pDesc->flags & NDR_CONTEXT_HANDLE_CANNOT_BE_NULL) && - !context_handle) + + if (context_handle) *phBinding = NDRCContextBinding(context_handle); + else if (pDesc->flags & NDR_CONTEXT_HANDLE_CANNOT_BE_NULL) { ERR("null context handle isn't allowed\n"); RpcRaiseException(RPC_X_SS_IN_NULL_CONTEXT); return NULL; } - *phBinding = NDRCContextBinding(context_handle); /* FIXME: should we store this structure in stubMsg.pContext? */ return pFormat + sizeof(NDR_EHD_CONTEXT); }

1 0

Alexandre Julliard : rpcrt4: Fix handling of arguments passed by value in the old-style stubless marshaller .
by Alexandre Julliard June 10, 2011

June 10, 2011

Module: wine Branch: master Commit: 5d7e4da81ab403b034e97b6c5fc4307fcef9217c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d7e4da81ab403b034e97b6c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 7 20:41:17 2011 +0200 rpcrt4: Fix handling of arguments passed by value in the old-style stubless marshaller. --- dlls/rpcrt4/ndr_stubless.c | 69 +++++++++++++++++++++++++++++++++++--------- 1 files changed, 55 insertions(+), 14 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 45cfc94..64b5f12 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -438,6 +438,23 @@ static unsigned int type_stack_size(unsigned char fc) } } +static BOOL is_by_value( PFORMAT_STRING format ) +{ + switch (*format) + { + case RPC_FC_USER_MARSHAL: + case RPC_FC_STRUCT: + case RPC_FC_PSTRUCT: + case RPC_FC_CSTRUCT: + case RPC_FC_CPSTRUCT: + case RPC_FC_CVSTRUCT: + case RPC_FC_BOGUS_STRUCT: + return TRUE; + default: + return FALSE; + } +} + void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, int phase, unsigned char *args, unsigned short stack_size, @@ -510,11 +527,9 @@ void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, } else { - const NDR_PARAM_OI_OTHER *pParamOther = - (const NDR_PARAM_OI_OTHER *)&pFormat[current_offset]; - - const unsigned char *pTypeFormat = - &pStubMsg->StubDesc->pFormatTypes[pParamOther->type_offset]; + const NDR_PARAM_OI_OTHER *pParamOther = (const NDR_PARAM_OI_OTHER *)&pFormat[current_offset]; + const unsigned char *pTypeFormat = &pStubMsg->StubDesc->pFormatTypes[pParamOther->type_offset]; + const BOOL by_value = is_by_value( pTypeFormat ); TRACE("\tcomplex type 0x%02x\n", *pTypeFormat); @@ -523,17 +538,28 @@ void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, case PROXY_CALCSIZE: if (pParam->param_direction == RPC_FC_IN_PARAM || pParam->param_direction == RPC_FC_IN_OUT_PARAM) - call_buffer_sizer(pStubMsg, *(unsigned char **)pArg, pTypeFormat); + { + if (!by_value) pArg = *(unsigned char **)pArg; + call_buffer_sizer(pStubMsg, pArg, pTypeFormat); + } break; case PROXY_MARSHAL: if (pParam->param_direction == RPC_FC_IN_PARAM || pParam->param_direction == RPC_FC_IN_OUT_PARAM) - call_marshaller(pStubMsg, *(unsigned char **)pArg, pTypeFormat); + { + if (!by_value) pArg = *(unsigned char **)pArg; + call_marshaller(pStubMsg, pArg, pTypeFormat); + } break; case PROXY_UNMARSHAL: if (pParam->param_direction == RPC_FC_IN_OUT_PARAM || pParam->param_direction == RPC_FC_OUT_PARAM) - call_unmarshaller(pStubMsg, (unsigned char **)pArg, pTypeFormat, 0); + { + if (by_value) + call_unmarshaller(pStubMsg, &pArg, pTypeFormat, 0); + else + call_unmarshaller(pStubMsg, (unsigned char **)pArg, pTypeFormat, 0); + } else if (pParam->param_direction == RPC_FC_RETURN_PARAM) call_unmarshaller(pStubMsg, (unsigned char **)pRetVal, pTypeFormat, 0); break; @@ -1283,6 +1309,7 @@ static LONG_PTR *stub_do_old_args(MIDL_STUB_MESSAGE *pStubMsg, const unsigned char * pTypeFormat = &pStubMsg->StubDesc->pFormatTypes[pParamOther->type_offset]; + const BOOL by_value = is_by_value( pTypeFormat ); TRACE("\tcomplex type 0x%02x\n", *pTypeFormat); @@ -1295,17 +1322,23 @@ static LONG_PTR *stub_do_old_args(MIDL_STUB_MESSAGE *pStubMsg, if (pParam->param_direction == RPC_FC_OUT_PARAM || pParam->param_direction == RPC_FC_IN_OUT_PARAM || pParam->param_direction == RPC_FC_RETURN_PARAM) - call_marshaller(pStubMsg, *(unsigned char **)pArg, pTypeFormat); + { + if (!by_value) pArg = *(unsigned char **)pArg; + call_marshaller(pStubMsg, pArg, pTypeFormat); + } break; case STUBLESS_FREE: if (pParam->param_direction == RPC_FC_IN_OUT_PARAM || pParam->param_direction == RPC_FC_IN_PARAM) - call_freer(pStubMsg, *(unsigned char **)pArg, pTypeFormat); - else if (pParam->param_direction == RPC_FC_OUT_PARAM) + { + if (!by_value) pArg = *(unsigned char **)pArg; + call_freer(pStubMsg, pArg, pTypeFormat); + } + else if (pParam->param_direction == RPC_FC_OUT_PARAM && !by_value) pStubMsg->pfnFree(*(void **)pArg); break; case STUBLESS_INITOUT: - if (pParam->param_direction == RPC_FC_OUT_PARAM) + if (pParam->param_direction == RPC_FC_OUT_PARAM && !by_value) { DWORD size = calc_arg_size(pStubMsg, pTypeFormat); @@ -1319,13 +1352,21 @@ static LONG_PTR *stub_do_old_args(MIDL_STUB_MESSAGE *pStubMsg, case STUBLESS_UNMARSHAL: if (pParam->param_direction == RPC_FC_IN_OUT_PARAM || pParam->param_direction == RPC_FC_IN_PARAM) - call_unmarshaller(pStubMsg, (unsigned char **)pArg, pTypeFormat, 0); + { + if (by_value) + call_unmarshaller(pStubMsg, &pArg, pTypeFormat, 0); + else + call_unmarshaller(pStubMsg, (unsigned char **)pArg, pTypeFormat, 0); + } break; case STUBLESS_CALCSIZE: if (pParam->param_direction == RPC_FC_OUT_PARAM || pParam->param_direction == RPC_FC_IN_OUT_PARAM || pParam->param_direction == RPC_FC_RETURN_PARAM) - call_buffer_sizer(pStubMsg, *(unsigned char **)pArg, pTypeFormat); + { + if (!by_value) pArg = *(unsigned char **)pArg; + call_buffer_sizer(pStubMsg, pArg, pTypeFormat); + } break; default: RpcRaiseException(RPC_S_INTERNAL_ERROR);

1 0