May 2010 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Use the FBO cache in stretch_rect_fbo().
by Alexandre Julliard May 6, 2010

May 6, 2010

Module: wine Branch: master Commit: 3345146d0b6d27b441918beb4f17b3b3feaee069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3345146d0b6d27b441918beb4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 5 18:22:35 2010 +0200 wined3d: Use the FBO cache in stretch_rect_fbo(). --- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 8 ++------ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ae4f754..24624ab 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -470,7 +470,7 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ } /* GL locking is done by the caller */ -static void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, +void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, IWineD3DSurfaceImpl *render_target, IWineD3DSurfaceImpl *depth_stencil) { if (surface_is_offscreen(render_target)) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3001b3b..f001591 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5808,11 +5808,9 @@ void stretch_rect_fbo(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_surfa } else { TRACE("Source surface %p is offscreen\n", src_surface); ENTER_GL(); - context_bind_fbo(context, GL_READ_FRAMEBUFFER, &context->src_fbo); - context_attach_surface_fbo(context, GL_READ_FRAMEBUFFER, 0, src_surface); + context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, src_surface, NULL); glReadBuffer(GL_COLOR_ATTACHMENT0); checkGLcall("glReadBuffer()"); - context_attach_depth_stencil_fbo(context, GL_READ_FRAMEBUFFER, NULL, FALSE); } LEAVE_GL(); @@ -5847,10 +5845,8 @@ void stretch_rect_fbo(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_surfa TRACE("Destination surface %p is offscreen\n", dst_surface); ENTER_GL(); - context_bind_fbo(context, GL_DRAW_FRAMEBUFFER, &context->dst_fbo); - context_attach_surface_fbo(context, GL_DRAW_FRAMEBUFFER, 0, dst_surface); + context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, dst_surface, NULL); context_set_draw_buffer(context, GL_COLOR_ATTACHMENT0); - context_attach_depth_stencil_fbo(context, GL_DRAW_FRAMEBUFFER, NULL, FALSE); } glDisable(GL_SCISSOR_TEST); IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cad88b9..8181b31 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1196,6 +1196,8 @@ void context_apply_blit_state(struct wined3d_context *context, IWineD3DDeviceImp void context_apply_clear_state(struct wined3d_context *context, IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *render_target, IWineD3DSurfaceImpl *depth_stencil) DECLSPEC_HIDDEN; void context_apply_draw_state(struct wined3d_context *context, IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; +void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, + IWineD3DSurfaceImpl *render_target, IWineD3DSurfaceImpl *depth_stencil) DECLSPEC_HIDDEN; void context_attach_depth_stencil_fbo(struct wined3d_context *context, GLenum fbo_target, IWineD3DSurfaceImpl *depth_stencil, BOOL use_render_buffer) DECLSPEC_HIDDEN; void context_attach_surface_fbo(const struct wined3d_context *context,

1 0

Aric Stewart : usp10: Fix ScriptGetCMap handling of unsupported glyphs.
by Alexandre Julliard May 6, 2010

May 6, 2010

Module: wine Branch: master Commit: abae85b9767dce7c4eb62f8faffdb328b664dd03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abae85b9767dce7c4eb62f8fa… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed May 5 11:51:52 2010 -0500 usp10: Fix ScriptGetCMap handling of unsupported glyphs. --- dlls/usp10/tests/usp10.c | 15 +++++++++++++-- dlls/usp10/usp10.c | 9 ++++++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index ad65b25..f76f95c 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -583,10 +583,12 @@ static void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256]) int cInChars; int cChars; unsigned short pwOutGlyphs3[256]; - WCHAR TestItem1[] = {'T', 'e', 's', 't', 'a', 0}; DWORD dwFlags; int cnt; + static const WCHAR TestItem1[] = {'T', 'e', 's', 't', 'a', 0}; + static const WCHAR TestItem2[] = {0x202B, 'i', 'n', 0x202C,0}; + /* Check to make sure that SCRIPT_CACHE gets allocated ok */ dwFlags = 0; cInChars = cChars = 5; @@ -627,10 +629,19 @@ static void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256]) for (cnt=0; cnt < cChars && pwOutGlyphs[cnt] == pwOutGlyphs3[cnt]; cnt++) {} ok (cnt == cInChars, "Translation not correct. WCHAR %d - %04x != %04x\n", cnt, pwOutGlyphs[cnt], pwOutGlyphs3[cnt]); - + hr = ScriptFreeCache( &psc); ok (!psc, "psc is not null after ScriptFreeCache\n"); + cInChars = cChars = 4; + hr = ScriptGetCMap(hdc, &psc, TestItem2, cInChars, dwFlags, pwOutGlyphs3); + ok (hr == S_FALSE, "ScriptGetCMap should return S_FALSE not (%08x)\n", hr); + ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); + ok(pwOutGlyphs3[0] == 0, "Glyph 0 should be default glyph\n"); + ok(pwOutGlyphs3[3] == 0, "Glyph 0 should be default glyph\n"); + + hr = ScriptFreeCache( &psc); + ok (!psc, "psc is not null after ScriptFreeCache\n"); } static void test_ScriptGetFontProperties(HDC hdc) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 0ab86a1..b736966 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1528,6 +1528,8 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars if ((hr = init_script_cache(hdc, psc)) != S_OK) return hr; + hr = S_OK; + if ((get_cache_pitch_family(psc) & TMPF_TRUETYPE)) { for (i = 0; i < cChars; i++) @@ -1537,6 +1539,11 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars WORD glyph; if (!hdc) return E_PENDING; if (GetGlyphIndicesW(hdc, &pwcInChars[i], 1, &glyph, GGI_MARK_NONEXISTING_GLYPHS) == GDI_ERROR) return S_FALSE; + if (glyph == 0xffff) + { + hr = S_FALSE; + glyph = 0x0; + } pwOutGlyphs[i] = set_cache_glyph(psc, pwcInChars[i], glyph); } } @@ -1546,7 +1553,7 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars TRACE("no glyph translation\n"); for (i = 0; i < cChars; i++) pwOutGlyphs[i] = pwcInChars[i]; } - return S_OK; + return hr; } /***********************************************************************

1 0

Aric Stewart : usp10: ScriptTextOut reorders glyphs that are RTL if they have been processed with fLogicalOrder in previous calls .
by Alexandre Julliard May 6, 2010

May 6, 2010

Module: wine Branch: master Commit: 2ba0048541d39e8cfef8d2b7c65f824bfd05ccaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ba0048541d39e8cfef8d2b7c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed May 5 13:30:33 2010 -0500 usp10: ScriptTextOut reorders glyphs that are RTL if they have been processed with fLogicalOrder in previous calls. --- dlls/usp10/usp10.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index b736966..3a7fcd1 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1578,8 +1578,25 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN if (!psa->fNoGlyphIndex) /* Have Glyphs? */ fuOptions |= ETO_GLYPH_INDEX; /* Say don't do translation to glyph */ - if (!ExtTextOutW(hdc, x, y, fuOptions, lprc, pwGlyphs, cGlyphs, NULL)) - hr = S_FALSE; + if (psa->fRTL && psa->fLogicalOrder) + { + int i; + WORD *rtlGlyphs; + + rtlGlyphs = heap_alloc(cGlyphs * sizeof(WORD)); + if (!rtlGlyphs) + return E_OUTOFMEMORY; + + for (i = 0; i < cGlyphs; i++) + rtlGlyphs[i] = pwGlyphs[cGlyphs-1-i]; + + if (!ExtTextOutW(hdc, x, y, fuOptions, lprc, rtlGlyphs, cGlyphs, NULL)) + hr = S_FALSE; + heap_free(rtlGlyphs); + } + else + if (!ExtTextOutW(hdc, x, y, fuOptions, lprc, pwGlyphs, cGlyphs, NULL)) + hr = S_FALSE; return hr; }

1 0

Sven Baars : credui: Fix Dutch translation.
by Alexandre Julliard May 6, 2010

May 6, 2010

Module: wine Branch: master Commit: 079c01c508a29c8c4193322af4b14383cffb176a URL: http://source.winehq.org/git/wine.git/?a=commit;h=079c01c508a29c8c4193322af… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed May 5 18:55:05 2010 +0200 credui: Fix Dutch translation. --- dlls/credui/credui_Nl.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/credui/credui_Nl.rc b/dlls/credui/credui_Nl.rc index 575496c..ac67a37 100644 --- a/dlls/credui/credui_Nl.rc +++ b/dlls/credui/credui_Nl.rc @@ -30,12 +30,12 @@ BEGIN CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, 0,213,37 LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP - LTEXT "&Gebruikers naam:",-1,8,62,72,12,SS_CENTERIMAGE + LTEXT "&Gebruikersnaam:",-1,8,62,72,12,SS_CENTERIMAGE CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 LTEXT "&Wachtwoord:",-1,8,80,72,12,SS_CENTERIMAGE EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "&Onthoudt mijn wachtwoord",IDC_SAVE,"Button", + CONTROL "&Onthoud mijn wachtwoord",IDC_SAVE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 DEFPUSHBUTTON "OK",IDOK,97,128,50,14 PUSHBUTTON "Annuleren",IDCANCEL,156,128,50,14 @@ -45,7 +45,7 @@ STRINGTABLE DISCARDABLE { IDS_TITLEFORMAT "Verbind met %s" IDS_MESSAGEFORMAT "Verbinden met %s" - IDS_INCORRECTPASSWORDTITLE "Aanloggen mislukt" + IDS_INCORRECTPASSWORDTITLE "Inloggen mislukt" IDS_INCORRECTPASSWORD "Controleer of uw gebruikersnaam\nen wachtwoord correct zijn." IDS_CAPSLOCKONTITLE "Caps Lock staat Aan" IDS_CAPSLOCKON "Met Caps Lock aan kan uw wachtwoord verkeerd worden ingevoerd.\n\nDruk op de Caps Lock toets op uw toetsenbord om Caps Lock uit\nte zetten voor invoer van uw wachtwoord."

1 0

Alexander Nicolaysen Sørnes : objectManager: Add missing parameter to handle_anonymous_submission() call
by Alexander Nicolaysen Sørnes May 6, 2010

May 6, 2010

Module: appdb Branch: master Commit: 951bb19e8ba3ec213bd6da65bcb0714627288661 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=951bb19e8ba3ec213bd6da65… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu May 6 17:41:31 2010 +0200 objectManager: Add missing parameter to handle_anonymous_submission() call --- include/objectManager.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index ed6c43e..1f250aa 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -1505,7 +1505,7 @@ class ObjectManager $oObject->update(); } else { - $this->handle_anonymous_submission(); + $this->handle_anonymous_submission($aClean); $oObject->create(); }

1 0

Huw Davies : gdi32: Fix ExtTextOutA -> W forwarding when ETO_PDY is set.
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: 9bee50f6d9c4d4055752239af432664a57923403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bee50f6d9c4d4055752239af… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 5 14:59:07 2010 +0100 gdi32: Fix ExtTextOutA -> W forwarding when ETO_PDY is set. --- dlls/gdi32/font.c | 26 +++++++++++++++++++++----- 1 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index eea53fd..c21036d 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1586,13 +1586,29 @@ BOOL WINAPI ExtTextOutA( HDC hdc, INT x, INT y, UINT flags, if (lpDx) { unsigned int i = 0, j = 0; - lpDxW = HeapAlloc( GetProcessHeap(), 0, wlen*sizeof(INT)); + /* allocate enough for a ETO_PDY */ + lpDxW = HeapAlloc( GetProcessHeap(), 0, 2*wlen*sizeof(INT)); while(i < count) { - if(IsDBCSLeadByteEx(codepage, str[i])) { - lpDxW[j++] = lpDx[i] + lpDx[i+1]; + if(IsDBCSLeadByteEx(codepage, str[i])) + { + if(flags & ETO_PDY) + { + lpDxW[j++] = lpDx[i * 2] + lpDx[(i + 1) * 2]; + lpDxW[j++] = lpDx[i * 2 + 1] + lpDx[(i + 1) * 2 + 1]; + } + else + lpDxW[j++] = lpDx[i] + lpDx[i + 1]; i = i + 2; - } else { - lpDxW[j++] = lpDx[i]; + } + else + { + if(flags & ETO_PDY) + { + lpDxW[j++] = lpDx[i * 2]; + lpDxW[j++] = lpDx[i * 2 + 1]; + } + else + lpDxW[j++] = lpDx[i]; i = i + 1; } }

1 0

Sven Baars : avifil32: Fix Dutch translation.
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: 2da433feb6d7a16f887bc5cef6649ba4316ef3d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2da433feb6d7a16f887bc5cef… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed May 5 14:56:53 2010 +0200 avifil32: Fix Dutch translation. --- dlls/avifil32/avifile_Nl.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/avifil32/avifile_Nl.rc b/dlls/avifil32/avifile_Nl.rc index b2546a0..29ddd17 100644 --- a/dlls/avifil32/avifile_Nl.rc +++ b/dlls/avifil32/avifile_Nl.rc @@ -33,7 +33,7 @@ BEGIN PUSHBUTTON "&Opties...",IDC_OPTIONS,170,17,50,14 AUTOCHECKBOX "&Interleave alle",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL - LTEXT "Losse frames",-1,129,43,36,9 + LTEXT "frames",-1,129,43,36,9 LTEXT "Huidig formaat:",-1,3,56,73,9 LTEXT "This space for rent",IDC_FORMATTEXT,75,56,90,26 DEFPUSHBUTTON "OK",IDOK,170,42,50,14

1 0

Piotr Caban : msvcrt: Added _ui64toa_s implementation.
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: df038ec544d50888f7e4db717d7e936e1b0db080 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df038ec544d50888f7e4db717… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 5 13:37:33 2010 +0200 msvcrt: Added _ui64toa_s implementation. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 38 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index e430401..b2a19c4 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -994,7 +994,7 @@ @ extern _tzname msvcrt._tzname @ cdecl _tzset() msvcrt._tzset @ cdecl _ui64toa(long long ptr long) msvcrt._ui64toa -@ stub _ui64toa_s +@ cdecl _ui64toa_s(long ptr long long) msvcrt._ui64toa_s @ cdecl _ui64tow(long long ptr long) msvcrt._ui64tow @ stub _ui64tow_s @ cdecl _ultoa(long ptr long) msvcrt._ultoa diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b09a32d..f41362d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -981,7 +981,7 @@ @ extern _tzname msvcrt._tzname @ cdecl _tzset() msvcrt._tzset @ cdecl _ui64toa(long long ptr long) msvcrt._ui64toa -@ stub _ui64toa_s +@ cdecl _ui64toa_s(long ptr long long) msvcrt._ui64toa_s @ cdecl _ui64tow(long long ptr long) msvcrt._ui64tow @ stub _ui64tow_s @ cdecl _ultoa(long ptr long) msvcrt._ultoa diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 42fe133..4334b85 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -932,7 +932,7 @@ @ extern _tzname MSVCRT__tzname @ cdecl _tzset() MSVCRT__tzset @ cdecl _ui64toa(long long ptr long) ntdll._ui64toa -# stub _ui64toa_s +@ cdecl _ui64toa_s(long ptr long long) MSVCRT__ui64toa_s @ cdecl _ui64tow(long long ptr long) ntdll._ui64tow # stub _ui64tow_s @ cdecl _ultoa(long ptr long) ntdll._ultoa diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 35f44ed..e1d9557 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -624,3 +624,41 @@ unsigned __int64 CDECL MSVCRT_strtoui64(const char *nptr, char **endptr, int bas { return MSVCRT_strtoui64_l(nptr, endptr, base, NULL); } + +/********************************************************************* + * _ui64toa_s (MSVCRT.@) + */ +int CDECL MSVCRT__ui64toa_s(unsigned __int64 value, char *str, + MSVCRT_size_t size, int radix) +{ + char buffer[65], *pos; + int digit; + + if(!str || radix<2 || radix>36) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + pos = buffer+64; + *pos = '\0'; + + do { + digit = value%radix; + value /= radix; + + if(digit < 10) + *--pos = '0'+digit; + else + *--pos = 'a'+digit-10; + }while(value != 0); + + if(buffer-pos+65 > size) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + memcpy(str, pos, buffer-pos+65); + return 0; +}

1 0

Hans Leidekker : msi: Forward MsiDetermineApplicablePatchesA to MsiDetermineApplicablePatchesW.
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: 881ef98479ed7aa5cb8616bb7008745af1d1e230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=881ef98479ed7aa5cb8616bb7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 5 14:37:24 2010 +0200 msi: Forward MsiDetermineApplicablePatchesA to MsiDetermineApplicablePatchesW. --- dlls/msi/msi.c | 39 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 2d33487..646963d 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -486,10 +486,43 @@ UINT WINAPI MsiApplyMultiplePatchesW(LPCWSTR szPatchPackages, UINT WINAPI MsiDetermineApplicablePatchesA(LPCSTR szProductPackagePath, DWORD cPatchInfo, PMSIPATCHSEQUENCEINFOA pPatchInfo) { - FIXME("(%s, %d, %p): stub!\n", debugstr_a(szProductPackagePath), - cPatchInfo, pPatchInfo); + UINT i, r; + WCHAR *package_path = NULL; + MSIPATCHSEQUENCEINFOW *psi; - return ERROR_CALL_NOT_IMPLEMENTED; + TRACE("(%s, %d, %p)\n", debugstr_a(szProductPackagePath), cPatchInfo, pPatchInfo); + + if (szProductPackagePath && !(package_path = strdupAtoW( szProductPackagePath ))) + return ERROR_OUTOFMEMORY; + + psi = msi_alloc( cPatchInfo * sizeof(*psi) ); + if (!psi) + { + msi_free( package_path ); + return ERROR_OUTOFMEMORY; + } + + for (i = 0; i < cPatchInfo; i++) + { + psi[i].szPatchData = strdupAtoW( pPatchInfo[i].szPatchData ); + psi[i].ePatchDataType = pPatchInfo[i].ePatchDataType; + } + + r = MsiDetermineApplicablePatchesW( package_path, cPatchInfo, psi ); + if (r == ERROR_SUCCESS) + { + for (i = 0; i < cPatchInfo; i++) + { + pPatchInfo[i].dwOrder = psi[i].dwOrder; + pPatchInfo[i].uStatus = psi[i].uStatus; + } + } + + msi_free( package_path ); + for (i = 0; i < cPatchInfo; i++) + msi_free( (WCHAR *)psi[i].szPatchData ); + msi_free( psi ); + return r; } static UINT MSI_ApplicablePatchW( MSIPACKAGE *package, LPCWSTR patch )

1 0

Jacek Caban : mshtml: Fixed IObjectSafety failure handling.
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: 072ecdf50446b23718c086be5b7e0f1bfab86184 URL: http://source.winehq.org/git/wine.git/?a=commit;h=072ecdf50446b23718c086be5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 5 13:21:36 2010 +0200 mshtml: Fixed IObjectSafety failure handling. --- dlls/mshtml/secmgr.c | 19 ++++++-- dlls/mshtml/tests/script.c | 108 +++++++++++++++++++++++++++++++++++++------ 2 files changed, 107 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=072ecdf50446b23718c08…

1 0