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

Alexandre Julliard : advapi32: Fix the parameter checks in QueryServiceStatusEx.
by Alexandre Julliard June 10, 2011

June 10, 2011

Module: wine Branch: master Commit: 519fbf620230882bec91a94789bfab2ae907fb7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=519fbf620230882bec91a9478… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 9 21:40:08 2011 +0200 advapi32: Fix the parameter checks in QueryServiceStatusEx. --- dlls/advapi32/service.c | 23 +++++++++++++++++------ dlls/advapi32/tests/service.c | 16 ++++++---------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 2b37338..1674c6f 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1172,21 +1172,32 @@ BOOL WINAPI QueryServiceStatusEx(SC_HANDLE hService, SC_STATUS_TYPE InfoLevel, TRACE("%p %d %p %d %p\n", hService, InfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); - __TRY + if (InfoLevel != SC_STATUS_PROCESS_INFO) { - err = svcctl_QueryServiceStatusEx(hService, InfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); + err = ERROR_INVALID_LEVEL; } - __EXCEPT(rpc_filter) + else if (cbBufSize < sizeof(SERVICE_STATUS_PROCESS)) { - err = map_exception_code(GetExceptionCode()); + *pcbBytesNeeded = sizeof(SERVICE_STATUS_PROCESS); + err = ERROR_INSUFFICIENT_BUFFER; + } + else + { + __TRY + { + err = svcctl_QueryServiceStatusEx(hService, InfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code(GetExceptionCode()); + } + __ENDTRY } - __ENDTRY if (err != ERROR_SUCCESS) { SetLastError(err); return FALSE; } - return TRUE; } diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index e86208f..e243db0 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -956,7 +956,6 @@ static void test_query_svc(void) SetLastError(0xdeadbeef); ret = pQueryServiceStatusEx(NULL, 1, NULL, 0, NULL); ok(!ret, "Expected failure\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_LEVEL, "Expected ERROR_INVALID_LEVEL, got %d\n", GetLastError()); @@ -966,8 +965,8 @@ static void test_query_svc(void) /* Only info level is correct. It looks like the buffer/size is checked second */ SetLastError(0xdeadbeef); - ret = pQueryServiceStatusEx(NULL, 0, NULL, 0, &needed); - /* NT4 and Wine check the handle first */ + ret = pQueryServiceStatusEx(NULL, SC_STATUS_PROCESS_INFO, NULL, 0, &needed); + /* NT4 checks the handle first */ if (GetLastError() != ERROR_INVALID_HANDLE) { ok(!ret, "Expected failure\n"); @@ -981,7 +980,7 @@ static void test_query_svc(void) statusproc = HeapAlloc(GetProcessHeap(), 0, sizeof(SERVICE_STATUS_PROCESS)); bufsize = needed; SetLastError(0xdeadbeef); - ret = pQueryServiceStatusEx(NULL, 0, (BYTE*)statusproc, bufsize, &needed); + ret = pQueryServiceStatusEx(NULL, SC_STATUS_PROCESS_INFO, (BYTE*)statusproc, bufsize, &needed); ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); @@ -989,25 +988,22 @@ static void test_query_svc(void) /* Correct handle and info level */ SetLastError(0xdeadbeef); - ret = pQueryServiceStatusEx(svc_handle, 0, NULL, 0, &needed); + ret = pQueryServiceStatusEx(svc_handle, SC_STATUS_PROCESS_INFO, NULL, 0, &needed); /* NT4 doesn't return the needed size */ if (GetLastError() != ERROR_INVALID_PARAMETER) { ok(!ret, "Expected failure\n"); - todo_wine - { ok(needed == sizeof(SERVICE_STATUS_PROCESS), "Needed buffersize is wrong : %d\n", needed); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); - } } /* All parameters are OK but we don't have enough rights */ statusproc = HeapAlloc(GetProcessHeap(), 0, sizeof(SERVICE_STATUS_PROCESS)); bufsize = sizeof(SERVICE_STATUS_PROCESS); SetLastError(0xdeadbeef); - ret = pQueryServiceStatusEx(svc_handle, 0, (BYTE*)statusproc, bufsize, &needed); + ret = pQueryServiceStatusEx(svc_handle, SC_STATUS_PROCESS_INFO, (BYTE*)statusproc, bufsize, &needed); ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_ACCESS_DENIED, "Expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); @@ -1021,7 +1017,7 @@ static void test_query_svc(void) statusproc = HeapAlloc(GetProcessHeap(), 0, sizeof(SERVICE_STATUS_PROCESS)); bufsize = sizeof(SERVICE_STATUS_PROCESS); SetLastError(0xdeadbeef); - ret = pQueryServiceStatusEx(svc_handle, 0, (BYTE*)statusproc, bufsize, &needed); + ret = pQueryServiceStatusEx(svc_handle, SC_STATUS_PROCESS_INFO, (BYTE*)statusproc, bufsize, &needed); ok(ret, "Expected success, got error %u\n", GetLastError()); if (statusproc->dwCurrentState == SERVICE_RUNNING) ok(statusproc->dwProcessId != 0,

1 0

Alexandre Julliard : dispex: Make sure we don' t pass a NULL array to IDispatchEx_InvokeEx.
by Alexandre Julliard June 10, 2011

June 10, 2011

Module: wine Branch: master Commit: a2f987c338ceea52e88c6e18cafc9de4f94471ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2f987c338ceea52e88c6e18c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 9 20:55:49 2011 +0200 dispex: Make sure we don't pass a NULL array to IDispatchEx_InvokeEx. --- dlls/dispex/usrmarshal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dispex/usrmarshal.c b/dlls/dispex/usrmarshal.c index cc72469..2fcba52 100644 --- a/dlls/dispex/usrmarshal.c +++ b/dlls/dispex/usrmarshal.c @@ -47,9 +47,9 @@ HRESULT CALLBACK IDispatchEx_InvokeEx_Proxy(IDispatchEx* This, DISPID id, LCID l HRESULT hr; VARIANT result; EXCEPINFO excep_info; - UINT byref_args, arg; + UINT byref_args, arg, dummy_idx; VARIANT dummy_arg, *ref_arg = &dummy_arg, *copy_arg, *orig_arg = NULL; - UINT *ref_idx = NULL; + UINT *ref_idx = &dummy_idx; DWORD dword_flags = wFlags & 0xf; TRACE("(%p)->(%08x, %04x, %04x, %p, %p, %p, %p)\n", This, id, lcid, wFlags,

1 0

Owen Rudge : winemapi: Ensure address is valid before checking for 'smtp:'.
by Alexandre Julliard June 9, 2011

June 9, 2011

Module: wine Branch: master Commit: 7cd20a413e1ab212f032269e4025aba18d0292af URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cd20a413e1ab212f032269e4… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Jun 9 16:27:43 2011 +0100 winemapi: Ensure address is valid before checking for 'smtp:'. --- dlls/winemapi/sendmail.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winemapi/sendmail.c b/dlls/winemapi/sendmail.c index e4629bb..93f0569 100644 --- a/dlls/winemapi/sendmail.c +++ b/dlls/winemapi/sendmail.c @@ -87,11 +87,12 @@ ULONG WINAPI MAPISendMail(LHANDLE session, ULONG_PTR uiparam, } address = message->lpRecips[i].lpszAddress; - if (!strncasecmp(address, smtp, sizeof(smtp) - 1)) - address += sizeof(smtp) - 1; if (address) { + if (!strncasecmp(address, smtp, sizeof(smtp) - 1)) + address += sizeof(smtp) - 1; + switch (message->lpRecips[i].ulRecipClass) { case MAPI_ORIG: @@ -172,11 +173,12 @@ ULONG WINAPI MAPISendMail(LHANDLE session, ULONG_PTR uiparam, for (i = 0; i < message->nRecipCount; i++) { address = message->lpRecips[i].lpszAddress; - if (!strncasecmp(address, smtp, sizeof(smtp) - 1)) - address += sizeof(smtp) - 1; if (address) { + if (!strncasecmp(address, smtp, sizeof(smtp) - 1)) + address += sizeof(smtp) - 1; + switch (message->lpRecips[i].ulRecipClass) { case MAPI_TO:

1 0

Juan Lang : crypt32: Support CERT_COMPARE_NAME_STR_A in CertFindCertificateInStore.
by Alexandre Julliard June 9, 2011

June 9, 2011

Module: wine Branch: master Commit: f1be598efacde1c6faa4c471e6bad23d319ef842 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1be598efacde1c6faa4c471e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jun 8 18:22:22 2011 -0700 crypt32: Support CERT_COMPARE_NAME_STR_A in CertFindCertificateInStore. --- dlls/crypt32/cert.c | 36 ++++++++++++++++++++++++++++++++++-- 1 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 12c013e..75b0e12 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1516,7 +1516,36 @@ static BOOL compare_cert_by_name_str(PCCERT_CONTEXT pCertContext, return ret; } -static PCCERT_CONTEXT find_cert_by_name_str(HCERTSTORE store, DWORD dwType, +static PCCERT_CONTEXT find_cert_by_name_str_a(HCERTSTORE store, DWORD dwType, + DWORD dwFlags, const void *pvPara, PCCERT_CONTEXT prev) +{ + PCCERT_CONTEXT found = NULL; + + TRACE("%s\n", debugstr_a(pvPara)); + + if (pvPara) + { + int len = MultiByteToWideChar(CP_ACP, 0, pvPara, -1, NULL, 0); + LPWSTR str = CryptMemAlloc(len * sizeof(WCHAR)); + + if (str) + { + LPWSTR ptr; + + MultiByteToWideChar(CP_ACP, 0, pvPara, -1, str, len); + for (ptr = str; *ptr; ptr++) + *ptr = tolowerW(*ptr); + found = cert_compare_certs_in_store(store, prev, + compare_cert_by_name_str, dwType, dwFlags, str); + CryptMemFree(str); + } + } + else + found = find_cert_any(store, dwType, dwFlags, NULL, prev); + return found; +} + +static PCCERT_CONTEXT find_cert_by_name_str_w(HCERTSTORE store, DWORD dwType, DWORD dwFlags, const void *pvPara, PCCERT_CONTEXT prev) { PCCERT_CONTEXT found = NULL; @@ -1574,8 +1603,11 @@ PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, case CERT_COMPARE_PUBLIC_KEY: compare = compare_cert_by_public_key; break; + case CERT_COMPARE_NAME_STR_A: + find = find_cert_by_name_str_a; + break; case CERT_COMPARE_NAME_STR_W: - find = find_cert_by_name_str; + find = find_cert_by_name_str_w; break; case CERT_COMPARE_SUBJECT_CERT: compare = compare_cert_by_subject_cert;

1 0

Michael Stefaniuc : ddraw: Use unsafe_impl_from_IDirect3DLight() for application provided ifaces.
by Alexandre Julliard June 9, 2011

June 9, 2011

Module: wine Branch: master Commit: 9059fee7c511cdd194349740018edc90b8b0cab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9059fee7c511cdd1943497400… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 9 11:57:45 2011 +0200 ddraw: Use unsafe_impl_from_IDirect3DLight() for application provided ifaces. --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/light.c | 9 +++++++++ dlls/ddraw/viewport.c | 23 +++++++++-------------- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index c749168..f1e0219 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -408,6 +408,7 @@ struct IDirect3DLightImpl void light_activate(IDirect3DLightImpl *light) DECLSPEC_HIDDEN; void light_deactivate(IDirect3DLightImpl *light) DECLSPEC_HIDDEN; void d3d_light_init(IDirect3DLightImpl *light, IDirectDrawImpl *ddraw) DECLSPEC_HIDDEN; +IDirect3DLightImpl *unsafe_impl_from_IDirect3DLight(IDirect3DLight *iface) DECLSPEC_HIDDEN; /****************************************************************************** * IDirect3DMaterial implementation structure - Wraps to D3D7 diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index f7b8347..0325cd4 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -281,3 +281,12 @@ void d3d_light_init(IDirect3DLightImpl *light, IDirectDrawImpl *ddraw) light->ref = 1; light->ddraw = ddraw; } + +IDirect3DLightImpl *unsafe_impl_from_IDirect3DLight(IDirect3DLight *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d_light_vtbl); + + return impl_from_IDirect3DLight(iface); +} diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 08af7e2..7dc3dd4 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -715,12 +715,11 @@ static HRESULT WINAPI IDirect3DViewportImpl_Clear(IDirect3DViewport3 *iface, * DDERR_INVALIDPARAMS if there are 8 lights or more * *****************************************************************************/ -static HRESULT WINAPI -IDirect3DViewportImpl_AddLight(IDirect3DViewport3 *iface, - IDirect3DLight *lpDirect3DLight) +static HRESULT WINAPI IDirect3DViewportImpl_AddLight(IDirect3DViewport3 *iface, + IDirect3DLight *lpDirect3DLight) { IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface; - IDirect3DLightImpl *lpDirect3DLightImpl = (IDirect3DLightImpl *)lpDirect3DLight; + IDirect3DLightImpl *lpDirect3DLightImpl = unsafe_impl_from_IDirect3DLight(lpDirect3DLight); DWORD i = 0; DWORD map = This->map_lights; @@ -771,12 +770,11 @@ IDirect3DViewportImpl_AddLight(IDirect3DViewport3 *iface, * DDERR_INVALIDPARAMS if the light wasn't found * *****************************************************************************/ -static HRESULT WINAPI -IDirect3DViewportImpl_DeleteLight(IDirect3DViewport3 *iface, - IDirect3DLight *lpDirect3DLight) +static HRESULT WINAPI IDirect3DViewportImpl_DeleteLight(IDirect3DViewport3 *iface, + IDirect3DLight *lpDirect3DLight) { IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface; - IDirect3DLightImpl *l = (IDirect3DLightImpl *)lpDirect3DLight; + IDirect3DLightImpl *l = unsafe_impl_from_IDirect3DLight(lpDirect3DLight); TRACE("iface %p, light %p.\n", iface, lpDirect3DLight); @@ -814,14 +812,11 @@ IDirect3DViewportImpl_DeleteLight(IDirect3DViewport3 *iface, * D3D_OK, because it's a stub * *****************************************************************************/ -static HRESULT WINAPI -IDirect3DViewportImpl_NextLight(IDirect3DViewport3 *iface, - IDirect3DLight *lpDirect3DLight, - IDirect3DLight **lplpDirect3DLight, - DWORD dwFlags) +static HRESULT WINAPI IDirect3DViewportImpl_NextLight(IDirect3DViewport3 *iface, + IDirect3DLight *lpDirect3DLight, IDirect3DLight **lplpDirect3DLight, DWORD dwFlags) { IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface; - IDirect3DLightImpl *l = (IDirect3DLightImpl *)lpDirect3DLight; + IDirect3DLightImpl *l = unsafe_impl_from_IDirect3DLight(lpDirect3DLight); struct list *entry; HRESULT hr;

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetFloatArray().
by Alexandre Julliard June 9, 2011

June 9, 2011

Module: wine Branch: master Commit: ecf37efd8287740d62392afbf4093e22fd47dd53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecf37efd8287740d62392afbf… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jun 9 07:38:34 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetFloatArray(). --- dlls/d3dx9_36/effect.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c18d581..ef5ad0b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1710,10 +1710,29 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetFloatArray(ID3DXBaseEffect *iface, static HRESULT WINAPI ID3DXBaseEffectImpl_GetFloatArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, FLOAT *f, UINT count) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = is_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, f %p, count %u stub\n", This, parameter, f, count); + TRACE("iface %p, parameter %p, f %p, count %u\n", This, parameter, f, count); - return E_NOTIMPL; + if (!param) param = get_parameter_by_name(This, NULL, parameter); + + if (f && param && (param->class == D3DXPC_SCALAR + || param->class == D3DXPC_VECTOR + || param->class == D3DXPC_MATRIX_ROWS + || param->class == D3DXPC_MATRIX_COLUMNS)) + { + UINT i, size = min(count, param->bytes / sizeof(DWORD)); + + for (i = 0; i < size; ++i) + { + f[i] = get_float(param->type, (DWORD *)param->data + i); + } + return D3D_OK; + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_SetVector(ID3DXBaseEffect* iface, D3DXHANDLE parameter, CONST D3DXVECTOR4* vector)

1 0

Michael Stefaniuc : ddraw: COM cleanup for the IDirect3DLight iface.
by Alexandre Julliard June 9, 2011

June 9, 2011

Module: wine Branch: master Commit: 05194507080646a65642f78f6c141263b8919860 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05194507080646a65642f78f6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 9 11:53:52 2011 +0200 ddraw: COM cleanup for the IDirect3DLight iface. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/light.c | 52 +++++++++++-------------------------------- 3 files changed, 16 insertions(+), 40 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 3a8dba1..df74def 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4550,7 +4550,7 @@ static HRESULT WINAPI d3d3_CreateLight(IDirect3D3 *iface, IDirect3DLight **light d3d_light_init(object, This); TRACE("Created light %p.\n", object); - *light = (IDirect3DLight *)object; + *light = &object->IDirect3DLight_iface; return D3D_OK; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index fd1017d..c749168 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -387,7 +387,7 @@ struct object_creation_info ******************************************************************************/ struct IDirect3DLightImpl { - const IDirect3DLightVtbl *lpVtbl; + IDirect3DLight IDirect3DLight_iface; LONG ref; /* IDirect3DLight fields */ diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index a6a3cad..f7b8347 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -91,9 +91,10 @@ void light_deactivate(IDirect3DLightImpl *light) } } -/***************************************************************************** - * IUnknown Methods. - *****************************************************************************/ +static inline IDirect3DLightImpl *impl_from_IDirect3DLight(IDirect3DLight *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DLightImpl, IDirect3DLight_iface); +} /***************************************************************************** * IDirect3DLight::QueryInterface @@ -116,19 +117,9 @@ static HRESULT WINAPI IDirect3DLightImpl_QueryInterface(IDirect3DLight *iface, R return E_NOINTERFACE; } -/***************************************************************************** - * IDirect3DLight::AddRef - * - * Increases the refcount by 1 - * - * Returns: - * The new refcount - * - *****************************************************************************/ -static ULONG WINAPI -IDirect3DLightImpl_AddRef(IDirect3DLight *iface) +static ULONG WINAPI IDirect3DLightImpl_AddRef(IDirect3DLight *iface) { - IDirect3DLightImpl *This = (IDirect3DLightImpl *)iface; + IDirect3DLightImpl *This = impl_from_IDirect3DLight(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("%p increasing refcount to %u.\n", This, ref); @@ -136,20 +127,9 @@ IDirect3DLightImpl_AddRef(IDirect3DLight *iface) return ref; } -/***************************************************************************** - * IDirect3DLight::Release - * - * Reduces the refcount by one. If the refcount falls to 0, the object - * is destroyed - * - * Returns: - * The new refcount - * - *****************************************************************************/ -static ULONG WINAPI -IDirect3DLightImpl_Release(IDirect3DLight *iface) +static ULONG WINAPI IDirect3DLightImpl_Release(IDirect3DLight *iface) { - IDirect3DLightImpl *This = (IDirect3DLightImpl *)iface; + IDirect3DLightImpl *This = impl_from_IDirect3DLight(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("%p decreasing refcount to %u.\n", This, ref); @@ -207,12 +187,10 @@ static const float zero_value[] = { 0.0, 0.0, 0.0, 0.0 }; -static HRESULT WINAPI -IDirect3DLightImpl_SetLight(IDirect3DLight *iface, - D3DLIGHT *lpLight) +static HRESULT WINAPI IDirect3DLightImpl_SetLight(IDirect3DLight *iface, D3DLIGHT *lpLight) { - IDirect3DLightImpl *This = (IDirect3DLightImpl *)iface; - LPD3DLIGHT7 light7 = &(This->light7); + IDirect3DLightImpl *This = impl_from_IDirect3DLight(iface); + LPD3DLIGHT7 light7 = &This->light7; TRACE("iface %p, light %p.\n", iface, lpLight); @@ -266,11 +244,9 @@ IDirect3DLightImpl_SetLight(IDirect3DLight *iface, * D3D_OK on success * DDERR_INVALIDPARAMS if Light is NULL *****************************************************************************/ -static HRESULT WINAPI -IDirect3DLightImpl_GetLight(IDirect3DLight *iface, - D3DLIGHT *lpLight) +static HRESULT WINAPI IDirect3DLightImpl_GetLight(IDirect3DLight *iface, D3DLIGHT *lpLight) { - IDirect3DLightImpl *This = (IDirect3DLightImpl *)iface; + IDirect3DLightImpl *This = impl_from_IDirect3DLight(iface); TRACE("iface %p, light %p.\n", iface, lpLight); @@ -301,7 +277,7 @@ static const struct IDirect3DLightVtbl d3d_light_vtbl = void d3d_light_init(IDirect3DLightImpl *light, IDirectDrawImpl *ddraw) { - light->lpVtbl = &d3d_light_vtbl; + light->IDirect3DLight_iface.lpVtbl = &d3d_light_vtbl; light->ref = 1; light->ddraw = ddraw; }

1 0

Alexandre Julliard : msi: Create temp files in the destination directory instead of the root.
by Alexandre Julliard June 9, 2011

June 9, 2011

Module: wine Branch: master Commit: 89472db9e3bc755427be98b7a7848c7480ec869d URL: http://source.winehq.org/git/wine.git/?a=commit;h=89472db9e3bc755427be98b7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 9 15:56:57 2011 +0200 msi: Create temp files in the destination directory instead of the root. --- dlls/msi/files.c | 25 ++++++++++++++----------- dlls/msi/media.c | 28 ++++++++++++++++------------ 2 files changed, 30 insertions(+), 23 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index af84e9b..94e5e6c 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -195,23 +195,25 @@ static UINT copy_install_file(MSIPACKAGE *package, MSIFILE *file, LPWSTR source) } if (gle == ERROR_SHARING_VIOLATION || gle == ERROR_USER_MAPPED_FILE) { - WCHAR tmpfileW[MAX_PATH], *pathW, *p; + WCHAR *tmpfileW, *pathW, *p; DWORD len; TRACE("file in use, scheduling rename operation\n"); - GetTempFileNameW(szBackSlash, szMsi, 0, tmpfileW); - len = strlenW(file->TargetPath) + strlenW(tmpfileW) + 1; - if (!(pathW = msi_alloc(len * sizeof(WCHAR)))) - return ERROR_OUTOFMEMORY; - - strcpyW(pathW, file->TargetPath); + if (!(pathW = strdupW( file->TargetPath ))) return ERROR_OUTOFMEMORY; if ((p = strrchrW(pathW, '\\'))) *p = 0; - strcatW(pathW, tmpfileW); + len = strlenW( pathW ) + 16; + if (!(tmpfileW = msi_alloc(len * sizeof(WCHAR)))) + { + msi_free( pathW ); + return ERROR_OUTOFMEMORY; + } + if (!GetTempFileNameW( pathW, szMsi, 0, tmpfileW )) tmpfileW[0] = 0; + msi_free( pathW ); - if (CopyFileW(source, pathW, FALSE) && + if (CopyFileW(source, tmpfileW, FALSE) && MoveFileExW(file->TargetPath, NULL, MOVEFILE_DELAY_UNTIL_REBOOT) && - MoveFileExW(pathW, file->TargetPath, MOVEFILE_DELAY_UNTIL_REBOOT)) + MoveFileExW(tmpfileW, file->TargetPath, MOVEFILE_DELAY_UNTIL_REBOOT)) { file->state = msifs_installed; package->need_reboot = 1; @@ -221,8 +223,9 @@ static UINT copy_install_file(MSIPACKAGE *package, MSIFILE *file, LPWSTR source) { gle = GetLastError(); WARN("failed to schedule rename operation: %d)\n", gle); + DeleteFileW( tmpfileW ); } - msi_free(pathW); + msi_free(tmpfileW); } return gle; diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 9de2566..9f29ef7 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -458,32 +458,36 @@ static INT_PTR cabinet_copy_file(FDINOTIFICATIONTYPE fdint, } if (err == ERROR_SHARING_VIOLATION || err == ERROR_USER_MAPPED_FILE) { - WCHAR tmpfileW[MAX_PATH], *tmppathW, *p; + WCHAR *tmpfileW, *tmppathW, *p; DWORD len; TRACE("file in use, scheduling rename operation\n"); - GetTempFileNameW(szBackSlash, szMsi, 0, tmpfileW); - len = strlenW(path) + strlenW(tmpfileW) + 1; - if (!(tmppathW = msi_alloc(len * sizeof(WCHAR)))) - return ERROR_OUTOFMEMORY; - - strcpyW(tmppathW, path); + if (!(tmppathW = strdupW( path ))) return ERROR_OUTOFMEMORY; if ((p = strrchrW(tmppathW, '\\'))) *p = 0; - strcatW(tmppathW, tmpfileW); + len = strlenW( tmppathW ) + 16; + if (!(tmpfileW = msi_alloc(len * sizeof(WCHAR)))) + { + msi_free( tmppathW ); + return ERROR_OUTOFMEMORY; + } + if (!GetTempFileNameW(tmppathW, szMsi, 0, tmpfileW)) tmpfileW[0] = 0; + msi_free( tmppathW ); - handle = CreateFileW(tmppathW, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, attrs, NULL); + handle = CreateFileW(tmpfileW, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, attrs, NULL); if (handle != INVALID_HANDLE_VALUE && MoveFileExW(path, NULL, MOVEFILE_DELAY_UNTIL_REBOOT) && - MoveFileExW(tmppathW, path, MOVEFILE_DELAY_UNTIL_REBOOT)) + MoveFileExW(tmpfileW, path, MOVEFILE_DELAY_UNTIL_REBOOT)) { data->package->need_reboot = 1; } else + { WARN("failed to schedule rename operation %s (error %d)\n", debugstr_w(path), GetLastError()); - - msi_free(tmppathW); + DeleteFileW( tmpfileW ); + } + msi_free(tmpfileW); } else WARN("failed to create %s (error %d)\n", debugstr_w(path), err);

1 0

Aric Stewart : usp10: Strip dangling joiners for Sinhala.
by Alexandre Julliard June 9, 2011

June 9, 2011

Module: wine Branch: master Commit: 0f795650f811d6f27557655c3ab8001fc20f6780 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f795650f811d6f27557655c3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 8 14:05:22 2011 -0500 usp10: Strip dangling joiners for Sinhala. --- dlls/usp10/shape.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index f64dbd7..03d97f4 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -2036,6 +2036,7 @@ static const VowelComponents Sinhala_vowels[] = { static void ContextualShape_Sinhala(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust) { int cCount = cChars; + int i; WCHAR *input; if (*pcGlyphs != cChars) @@ -2057,7 +2058,15 @@ static void ContextualShape_Sinhala(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS * Indic_ReorderCharacters( input, cCount, sinhala_lex, Reorder_Like_Sinhala); TRACE("reordered string %s\n",debugstr_wn(input,cCount)); - /* Step 3: Get glyphs */ + /* Step 3: Strip dangling joiners */ + for (i = 0; i < cCount; i++) + { + if ((input[i] == 0x200D || input[i] == 0x200C) && + (i == 0 || input[i-1] == 0x0020 || i == cCount-1 || input[i+1] == 0x0020)) + input[i] = 0x0020; + } + + /* Step 4: Get glyphs */ GetGlyphIndicesW(hdc, input, cCount, pwOutGlyphs, 0); *pcGlyphs = cCount;

1 0

Dylan Smith : d3dxof: Remove unnecessary fields from IDirectXFileEnumObjectImpl.
by Alexandre Julliard June 9, 2011

June 9, 2011

Module: wine Branch: master Commit: 5819cc5c013ea1d0e273b15087d13dc16a6ba64b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5819cc5c013ea1d0e273b1508… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jun 8 15:38:51 2011 -0400 d3dxof: Remove unnecessary fields from IDirectXFileEnumObjectImpl. --- dlls/d3dxof/d3dxof.c | 46 ++++++++++++++--------------------------- dlls/d3dxof/d3dxof_private.h | 6 +---- 2 files changed, 17 insertions(+), 35 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 6717fc7..8392c31 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -141,17 +141,12 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV IDirectXFileEnumObjectImpl* object; HRESULT hr; DWORD* header; - HANDLE hFile = INVALID_HANDLE_VALUE; - HANDLE file_mapping = 0; - LPBYTE buffer = NULL; - HGLOBAL resource_data = 0; + LPBYTE mapped_memory = NULL; LPBYTE decomp_buffer = NULL; DWORD decomp_size = 0; LPBYTE file_buffer; DWORD file_size; - LPDXFILELOADMEMORY lpdxflm = NULL; - TRACE("(%p/%p)->(%p,%x,%p)\n", This, iface, pvSource, dwLoadOptions, ppEnumObj); if (!ppEnumObj) @@ -162,6 +157,8 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV if (dwLoadOptions == DXFILELOAD_FROMFILE) { + HANDLE hFile, file_mapping; + TRACE("Open source file '%s'\n", (char*)pvSource); hFile = CreateFileA(pvSource, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); @@ -176,21 +173,25 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV file_mapping = CreateFileMappingA(hFile, NULL, PAGE_READONLY, 0, 0, NULL); if (!file_mapping) { + CloseHandle(hFile); hr = DXFILEERR_BADFILETYPE; goto error; } - buffer = MapViewOfFile(file_mapping, FILE_MAP_READ, 0, 0, 0); - if (!buffer) + mapped_memory = MapViewOfFile(file_mapping, FILE_MAP_READ, 0, 0, 0); + CloseHandle(file_mapping); + CloseHandle(hFile); + if (!mapped_memory) { hr = DXFILEERR_BADFILETYPE; goto error; } - file_buffer = buffer; + file_buffer = mapped_memory; } else if (dwLoadOptions == DXFILELOAD_FROMRESOURCE) { HRSRC resource_info; + HGLOBAL resource_data; LPDXFILELOADRESOURCE lpdxflr = pvSource; TRACE("Source in resource (module = %p, name = %s, type = %s\n", lpdxflr->hModule, debugstr_a(lpdxflr->lpName), debugstr_a(lpdxflr->lpType)); @@ -220,7 +221,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV } else if (dwLoadOptions == DXFILELOAD_FROMMEMORY) { - lpdxflm = pvSource; + LPDXFILELOADMEMORY lpdxflm = pvSource; TRACE("Source in memory at %p with size %d\n", lpdxflm->lpMemory, lpdxflm->dSize); @@ -312,10 +313,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV if (FAILED(hr)) goto error; - object->source = dwLoadOptions; - object->hFile = hFile; - object->file_mapping = file_mapping; - object->buffer = buffer; + object->mapped_memory = mapped_memory; object->decomp_buffer = decomp_buffer; object->pDirectXFile = This; object->buf.pdxf = This; @@ -366,14 +364,8 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV return DXFILE_OK; error: - if (buffer) - UnmapViewOfFile(buffer); - if (file_mapping) - CloseHandle(file_mapping); - if (hFile != INVALID_HANDLE_VALUE) - CloseHandle(hFile); - if (resource_data) - FreeResource(resource_data); + if (mapped_memory) + UnmapViewOfFile(mapped_memory); HeapFree(GetProcessHeap(), 0, decomp_buffer); *ppEnumObj = NULL; @@ -1134,14 +1126,8 @@ static ULONG WINAPI IDirectXFileEnumObjectImpl_Release(IDirectXFileEnumObject* i int i; for (i = 0; i < This->nb_xobjects; i++) IDirectXFileData_Release(This->pRefObjects[i]); - if (This->source == DXFILELOAD_FROMFILE) - { - UnmapViewOfFile(This->buffer); - CloseHandle(This->file_mapping); - CloseHandle(This->hFile); - } - else if (This->source == DXFILELOAD_FROMRESOURCE) - FreeResource(This->resource_data); + if (This->mapped_memory) + UnmapViewOfFile(This->mapped_memory); HeapFree(GetProcessHeap(), 0, This->decomp_buffer); HeapFree(GetProcessHeap(), 0, This); } diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 927ccc4..5e61d65 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -146,11 +146,7 @@ typedef struct { typedef struct { IDirectXFileEnumObject IDirectXFileEnumObject_iface; LONG ref; - DXFILELOADOPTIONS source; - HANDLE hFile; - HANDLE file_mapping; - LPBYTE buffer; - HGLOBAL resource_data; + LPBYTE mapped_memory; LPBYTE decomp_buffer; parse_buffer buf; IDirectXFileImpl* pDirectXFile;

1 0