October 2013 - Wine-Commits

Henri Verbeet : wined3d: Avoid initializing some more variables.
by Alexandre Julliard Oct. 29, 2013

Oct. 29, 2013

Module: wine Branch: master Commit: 3d226df3b90702507da2529b4f58deff06d3d2a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d226df3b90702507da2529b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 29 10:28:03 2013 +0100 wined3d: Avoid initializing some more variables. --- dlls/wined3d/state.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 15a0b5a..d31cadf 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -821,16 +821,16 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ const struct wined3d_gl_info *gl_info = context->gl_info; DWORD onesided_enable; DWORD twosided_enable; - GLint func = GL_ALWAYS; - GLint func_ccw = GL_ALWAYS; - GLint ref = 0; - GLuint mask = 0; - GLint stencilFail = GL_KEEP; - GLint depthFail = GL_KEEP; - GLint stencilPass = GL_KEEP; - GLint stencilFail_ccw = GL_KEEP; - GLint depthFail_ccw = GL_KEEP; - GLint stencilPass_ccw = GL_KEEP; + GLint func; + GLint func_ccw; + GLint ref; + GLuint mask; + GLint stencilFail; + GLint stencilFail_ccw; + GLint stencilPass; + GLint stencilPass_ccw; + GLint depthFail; + GLint depthFail_ccw; /* No stencil test without a stencil buffer. */ if (!state->fb->depth_stencil)

1 0

Lucas Zawacki : Portuguese translation for release 1.7.5
by Jeremy Newman Oct. 29, 2013

Oct. 29, 2013

Module: website Branch: master Commit: 93c60675c4315b5a09097edd9b2522b6245492dc URL: http://source.winehq.org/git/website.git/?a=commit;h=93c60675c4315b5a09097e… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue Oct 29 12:33:33 2013 -0200 Portuguese translation for release 1.7.5 --- news/pt/2013102501.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/pt/2013102501.xml b/news/pt/2013102501.xml new file mode 100644 index 0000000..1c221d0 --- /dev/null +++ b/news/pt/2013102501.xml @@ -0,0 +1,15 @@ +<news> +<date>25 de Outubro de 2013</date> +<title>Wine 1.7.5 lançado</title> +<body> + A versão de desenvolvimento 1.7.5 já está disponível agora. + <a href="{$root}/announce/1.7.5">Novidades</a> desta versão: +<ul> + <li>Superte a COM sem registro usando contextos de ativação.</li> + <li>Melhoria no suporte a simulação de fontes em negrito.</li> + <li>Dados Unicode atualizados para Unicode 6.3.</li> + <li>Melhor suporte a registro da typelib para 64-bit.</li> + <li>Várias correções de bugs.</li> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.5.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e irão aparecer em breve em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

André Hentschel : riched32/tests: Fix tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: ddd6fd1ecbc4c25cf6c69202934c8bf2a3f01daf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddd6fd1ecbc4c25cf6c692029… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Oct 25 18:01:57 2013 +0200 riched32/tests: Fix tests compilation with __WINESRC__ defined. --- dlls/riched32/tests/Makefile.in | 1 - dlls/riched32/tests/editor.c | 269 ++++++++++++++++++++------------------- 2 files changed, 135 insertions(+), 135 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ddd6fd1ecbc4c25cf6c69…

1 0

André Hentschel : riched20/tests: Fix txtsrv tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: 86a30afeb51c07e597544f0c85bc557467218788 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86a30afeb51c07e597544f0c8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Oct 25 17:51:15 2013 +0200 riched20/tests: Fix txtsrv tests compilation with __WINESRC__ defined. --- dlls/riched20/tests/Makefile.in | 1 - dlls/riched20/tests/txtsrv.c | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/tests/Makefile.in b/dlls/riched20/tests/Makefile.in index b98fc25..9532df8 100644 --- a/dlls/riched20/tests/Makefile.in +++ b/dlls/riched20/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = riched20.dll IMPORTS = ole32 oleaut32 user32 gdi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ editor.c \ diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 3e88c72..566381c 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -30,6 +30,7 @@ #include <objbase.h> #include <richedit.h> #include <initguid.h> +#include <imm.h> #include <textserv.h> #include <wine/test.h> #include <oleauto.h> @@ -720,7 +721,7 @@ static void test_TxGetNaturalSize(void) { /* Variables with the text metric information */ INT charwidth_caps_text[26]; - TEXTMETRIC tmInfo_text; + TEXTMETRICA tmInfo_text; if (!init_texthost()) return; @@ -730,9 +731,9 @@ static void test_TxGetNaturalSize(void) { /* Populate the metric strucs */ SetMapMode(hdcDraw,MM_TEXT); - GetTextMetrics(hdcDraw, &tmInfo_text); + GetTextMetricsA(hdcDraw, &tmInfo_text); SetLastError(0xdeadbeef); - ret = GetCharWidth32(hdcDraw,'A','Z',charwidth_caps_text); + ret = GetCharWidth32A(hdcDraw,'A','Z',charwidth_caps_text); if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { win_skip("GetCharWidth32 is not available\n"); goto cleanup;

1 0

André Hentschel : riched20/tests: Fix editor tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: 1431b1e9c41c587a36785c5969dfeb68c0999104 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1431b1e9c41c587a36785c596… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Oct 25 17:48:28 2013 +0200 riched20/tests: Fix editor tests compilation with __WINESRC__ defined. --- dlls/riched20/tests/editor.c | 2272 +++++++++++++++++++++--------------------- 1 files changed, 1127 insertions(+), 1145 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1431b1e9c41c587a36785…

1 0

Marcus Meissner : crypt32: Avoid NULL ptr dereferences before checks ( Coverity).
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: cf1bbb3bb88ea8f6fdcffe3c203b379118aad6ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf1bbb3bb88ea8f6fdcffe3c2… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Oct 26 10:33:23 2013 +0200 crypt32: Avoid NULL ptr dereferences before checks (Coverity). --- dlls/crypt32/ctl.c | 4 +++- dlls/crypt32/store.c | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index fa98556..c18e608 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -341,7 +341,7 @@ PCCTL_CONTEXT WINAPI CertFindCTLInStore(HCERTSTORE hCertStore, BOOL WINAPI CertDeleteCTLFromStore(PCCTL_CONTEXT pCtlContext) { - WINECRYPT_CERTSTORE *hcs = pCtlContext->hCertStore; + WINECRYPT_CERTSTORE *hcs; ctl_t *ctl = ctl_from_ptr(pCtlContext); BOOL ret; @@ -350,6 +350,8 @@ BOOL WINAPI CertDeleteCTLFromStore(PCCTL_CONTEXT pCtlContext) if (!pCtlContext) return TRUE; + hcs = pCtlContext->hCertStore; + if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC) return FALSE; diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 6c34e55..d5d7443 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -949,13 +949,15 @@ PCCERT_CONTEXT WINAPI CertEnumCertificatesInStore(HCERTSTORE hCertStore, PCCERT_ BOOL WINAPI CertDeleteCertificateFromStore(PCCERT_CONTEXT pCertContext) { - WINECRYPT_CERTSTORE *hcs = pCertContext->hCertStore; + WINECRYPT_CERTSTORE *hcs; TRACE("(%p)\n", pCertContext); if (!pCertContext) return TRUE; + hcs = pCertContext->hCertStore; + if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC) return FALSE; @@ -1084,7 +1086,7 @@ BOOL WINAPI CertAddCRLContextToStore(HCERTSTORE hCertStore, BOOL WINAPI CertDeleteCRLFromStore(PCCRL_CONTEXT pCrlContext) { - WINECRYPT_CERTSTORE *hcs = pCrlContext->hCertStore; + WINECRYPT_CERTSTORE *hcs; BOOL ret; TRACE("(%p)\n", pCrlContext); @@ -1092,6 +1094,8 @@ BOOL WINAPI CertDeleteCRLFromStore(PCCRL_CONTEXT pCrlContext) if (!pCrlContext) return TRUE; + hcs = pCrlContext->hCertStore; + if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC) return FALSE;

1 0

André Hentschel : riched20/tests: Fix richole tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: 27fb62621a07dee0f2116f7231624c3158f97492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27fb62621a07dee0f2116f723… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Oct 25 17:50:46 2013 +0200 riched20/tests: Fix richole tests compilation with __WINESRC__ defined. --- dlls/riched20/tests/richole.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 196042b..63208ee 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -35,18 +35,17 @@ static HMODULE hmoduleRichEdit; -static HWND new_window(LPCTSTR lpClassName, DWORD dwStyle, HWND parent) +static HWND new_window(LPCSTR lpClassName, DWORD dwStyle, HWND parent) { - HWND hwnd - = CreateWindow(lpClassName, NULL, - dwStyle | WS_POPUP | WS_HSCROLL | WS_VSCROLL | WS_VISIBLE, - 0, 0, 200, 60, parent, NULL, hmoduleRichEdit, NULL); + HWND hwnd = CreateWindowA(lpClassName, NULL, + dwStyle | WS_POPUP | WS_HSCROLL | WS_VSCROLL | WS_VISIBLE, + 0, 0, 200, 60, parent, NULL, hmoduleRichEdit, NULL); return hwnd; } static HWND new_richedit(HWND parent) { - return new_window(RICHEDIT_CLASS, ES_MULTILINE, parent); + return new_window(RICHEDIT_CLASS20A, ES_MULTILINE, parent); } static BOOL touch_file(LPCWSTR filename) @@ -78,7 +77,7 @@ static void create_interfaces(HWND *w, IRichEditOle **reOle, ITextDocument **txt ITextSelection **txtSel) { *w = new_richedit(NULL); - SendMessage(*w, EM_GETOLEINTERFACE, 0, (LPARAM) reOle); + SendMessageA(*w, EM_GETOLEINTERFACE, 0, (LPARAM)reOle); IRichEditOle_QueryInterface(*reOle, &IID_ITextDocument, (void **) txtDoc); ITextDocument_GetSelection(*txtDoc, txtSel); @@ -109,7 +108,7 @@ static void test_Interfaces(void) return; } - res = SendMessage(w, EM_GETOLEINTERFACE, 0, (LPARAM) &reOle); + res = SendMessageA(w, EM_GETOLEINTERFACE, 0, (LPARAM)&reOle); ok(res, "SendMessage\n"); ok(reOle != NULL, "EM_GETOLEINTERFACE\n");

1 0

Lasse Rasinen : d3d9: Update locked_rect only if wined3d_surface_map succeeds.
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: eeefed3dd02f5299e38d308ee6d9ba6998722bdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeefed3dd02f5299e38d308ee… Author: Lasse Rasinen <lrasinen(a)iki.fi> Date: Mon Oct 28 18:48:17 2013 +0200 d3d9: Update locked_rect only if wined3d_surface_map succeeds. --- dlls/d3d9/surface.c | 7 +++++-- dlls/d3d9/tests/device.c | 5 +++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 99f0b0f..d475ae4 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -293,8 +293,11 @@ static HRESULT WINAPI d3d9_surface_LockRect(IDirect3DSurface9 *iface, hr = wined3d_surface_map(surface->wined3d_surface, &map_desc, rect, flags); wined3d_mutex_unlock(); - locked_rect->Pitch = map_desc.row_pitch; - locked_rect->pBits = map_desc.data; + if (SUCCEEDED(hr)) + { + locked_rect->Pitch = map_desc.row_pitch; + locked_rect->pBits = map_desc.data; + } return hr; } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 32fe8c7..37fb8fe 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -5402,8 +5402,13 @@ static void test_lockrect_invalid(void) hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0); ok(SUCCEEDED(hr), "Failed to lock surface with rect NULL, hr %#x.\n", hr); + locked_rect.pBits = (BYTE *)0xdeadbeef; + locked_rect.Pitch = 1; hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(locked_rect.pBits == (BYTE *)0xdeadbeef, "Got unexpected pBits: %p\n", + locked_rect.pBits); + ok(locked_rect.Pitch == 1, "Got unexpected pitch %d\n", locked_rect.Pitch); hr = IDirect3DSurface9_UnlockRect(surface); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr);

1 0

Henri Verbeet : d3drm: Initialize the actual array in d3drm_visual_array_create() as well.
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: c0d05d9f4f2d7b7d14d8b4f5e49789eb6e9d1882 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0d05d9f4f2d7b7d14d8b4f5e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 28 11:46:40 2013 +0100 d3drm: Initialize the actual array in d3drm_visual_array_create() as well. --- dlls/d3drm/frame.c | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 26501c2..28e222f 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -315,15 +315,32 @@ static const struct IDirect3DRMVisualArrayVtbl d3drm_visual_array_vtbl = d3drm_visual_array_GetElement, }; -static struct d3drm_visual_array *d3drm_visual_array_create(void) +static struct d3drm_visual_array *d3drm_visual_array_create(unsigned int visual_count, IDirect3DRMVisual **visuals) { struct d3drm_visual_array *array; + unsigned int i; if (!(array = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*array)))) return NULL; array->IDirect3DRMVisualArray_iface.lpVtbl = &d3drm_visual_array_vtbl; array->ref = 1; + array->size = visual_count; + + if (visual_count) + { + if (!(array->visuals = HeapAlloc(GetProcessHeap(), 0, visual_count * sizeof(*array->visuals)))) + { + HeapFree(GetProcessHeap(), 0, array); + return NULL; + } + + for (i = 0; i < visual_count; ++i) + { + array->visuals[i] = visuals[i]; + IDirect3DRMVisual_AddRef(array->visuals[i]); + } + } return array; } @@ -765,26 +782,9 @@ static HRESULT WINAPI d3drm_frame2_GetVisuals(IDirect3DRMFrame2 *iface, IDirect3 if (!visuals) return D3DRMERR_BADVALUE; - if (!(array = d3drm_visual_array_create())) + if (!(array = d3drm_visual_array_create(frame->nb_visuals, frame->visuals))) return E_OUTOFMEMORY; - array->size = frame->nb_visuals; - if (frame->nb_visuals) - { - ULONG i; - - if (!(array->visuals = HeapAlloc(GetProcessHeap(), 0, frame->nb_visuals * sizeof(*array->visuals)))) - { - HeapFree(GetProcessHeap(), 0, array); - return E_OUTOFMEMORY; - } - for (i = 0; i < frame->nb_visuals; ++i) - { - array->visuals[i] = frame->visuals[i]; - IDirect3DRMVisual_AddRef(frame->visuals[i]); - } - } - *visuals = &array->IDirect3DRMVisualArray_iface; return D3DRM_OK;

1 0

Nikolay Sivov : wshom.ocx: Silence failure to query IDispatchEx from IWshShell3.
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: f3c805be67df81713bd7b6130d03dace50688a49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3c805be67df81713bd7b6130… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 27 12:27:45 2013 +0400 wshom.ocx: Silence failure to query IDispatchEx from IWshShell3. --- dlls/wshom.ocx/shell.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index bc6a839..17d0306 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -21,6 +21,7 @@ #include "shellapi.h" #include "shlobj.h" +#include "dispex.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -576,14 +577,21 @@ static HRESULT WINAPI WshShell3_QueryInterface(IWshShell3 *iface, REFIID riid, v { TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); + *ppv = NULL; + if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDispatch) || IsEqualGUID(riid, &IID_IWshShell3)) { *ppv = iface; - }else { + } + else if (IsEqualGUID(riid, &IID_IDispatchEx)) + { + return E_NOINTERFACE; + } + else + { FIXME("Unknown iface %s\n", debugstr_guid(riid)); - *ppv = NULL; return E_NOINTERFACE; }

1 0