October 2011 - Wine-Commits

Henri Verbeet : wined3d: Make the device parameter to surface_blt_to_drawable() const.
by Alexandre Julliard Oct. 27, 2011

Oct. 27, 2011

Module: wine Branch: master Commit: bf5ab0a199080347ff20435bff0f470210643c33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf5ab0a199080347ff20435bf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 27 17:06:26 2011 +0200 wined3d: Make the device parameter to surface_blt_to_drawable() const. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 91c0f60..c13fc26 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5324,7 +5324,7 @@ void surface_translate_drawable_coords(const struct wined3d_surface *surface, HW rect->bottom = drawable_height - rect->bottom; } -static void surface_blt_to_drawable(struct wined3d_device *device, +static void surface_blt_to_drawable(const struct wined3d_device *device, WINED3DTEXTUREFILTERTYPE filter, BOOL color_key, struct wined3d_surface *src_surface, const RECT *src_rect_in, struct wined3d_surface *dst_surface, const RECT *dst_rect_in)

1 0

Henri Verbeet : wined3d: Rename nCfgs to cfg_count.
by Alexandre Julliard Oct. 27, 2011

Oct. 27, 2011

Module: wine Branch: master Commit: dbfe83baff0838e68e6b8108a5be7f8f54ff4ea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbfe83baff0838e68e6b8108a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 27 17:06:25 2011 +0200 wined3d: Rename nCfgs to cfg_count. --- dlls/wined3d/context.c | 6 +++--- dlls/wined3d/directx.c | 40 ++++++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e384fb3..29d0b3f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1151,8 +1151,8 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC { FALSE, FALSE, FALSE }, }; - int i = 0; - int nCfgs = device->adapter->nCfgs; + unsigned int cfg_count = device->adapter->cfg_count; + unsigned int i; TRACE("device %p, dc %p, color_format %s, ds_format %s, aux_buffers %#x, find_compatible %#x.\n", device, hdc, debug_d3dformat(color_format->id), debug_d3dformat(ds_format->id), @@ -1169,7 +1169,7 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC for (matchtry = 0; matchtry < (sizeof(matches) / sizeof(*matches)) && !iPixelFormat; ++matchtry) { - for (i = 0; i < nCfgs; ++i) + for (i = 0; i < cfg_count; ++i) { const struct wined3d_pixel_format *cfg = &device->adapter->cfgs[i]; BOOL exactDepthMatch = TRUE; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6d282d9..5422a74 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3164,7 +3164,7 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, unsigned int i; cfgs = adapter->cfgs; - cfg_count = adapter->nCfgs; + cfg_count = adapter->cfg_count; for (i = 0; i < cfg_count; ++i) { if (wined3d_check_pixel_format_color(&adapter->gl_info, &cfgs[i], rt_format) @@ -3234,8 +3234,6 @@ static BOOL CheckBumpMapCapability(const struct wined3d_adapter *adapter, const static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *display_format, const struct wined3d_format *ds_format) { - int it=0; - /* Only allow depth/stencil formats */ if (!(ds_format->depth_size || ds_format->stencil_size)) return FALSE; @@ -3258,10 +3256,12 @@ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, } else { + unsigned int i; + /* Walk through all WGL pixel formats to find a match */ - for (it = 0; it < adapter->nCfgs; ++it) + for (i = 0; i < adapter->cfg_count; ++i) { - const struct wined3d_pixel_format *cfg = &adapter->cfgs[it]; + const struct wined3d_pixel_format *cfg = &adapter->cfgs[i]; if (wined3d_check_pixel_format_color(&adapter->gl_info, cfg, display_format) && wined3d_check_pixel_format_depth(&adapter->gl_info, cfg, ds_format)) return TRUE; @@ -3290,7 +3290,7 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, BYTE AdapterRed, AdapterGreen, AdapterBlue, AdapterAlpha, AdapterTotalSize; BYTE CheckRed, CheckGreen, CheckBlue, CheckAlpha, CheckTotalSize; const struct wined3d_pixel_format *cfgs = adapter->cfgs; - int it; + unsigned int i; getColorBits(adapter_format, &AdapterRed, &AdapterGreen, &AdapterBlue, &AdapterAlpha, &AdapterTotalSize); getColorBits(check_format, &CheckRed, &CheckGreen, &CheckBlue, &CheckAlpha, &CheckTotalSize); @@ -3304,13 +3304,13 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, /* Check if there is a WGL pixel format matching the requirements, the format should also be window * drawable (not offscreen; e.g. Nvidia offers R5G6B5 for pbuffers even when X is running at 24bit) */ - for (it = 0; it < adapter->nCfgs; ++it) + for (i = 0; i < adapter->cfg_count; ++i) { - if (cfgs[it].windowDrawable - && wined3d_check_pixel_format_color(&adapter->gl_info, &cfgs[it], check_format)) + if (cfgs[i].windowDrawable + && wined3d_check_pixel_format_color(&adapter->gl_info, &cfgs[i], check_format)) { TRACE_(d3d_caps)("Pixel format %d is compatible with format %s.\n", - cfgs[it].iPixelFormat, debug_d3dformat(check_format->id)); + cfgs[i].iPixelFormat, debug_d3dformat(check_format->id)); return TRUE; } } @@ -5289,15 +5289,17 @@ static BOOL InitAdapters(struct wined3d *wined3d) if (gl_info->supported[WGL_ARB_PIXEL_FORMAT]) { + GLint cfg_count; int attribute; int attribs[11]; int values[11]; int nAttribs = 0; attribute = WGL_NUMBER_PIXEL_FORMATS_ARB; - GL_EXTCALL(wglGetPixelFormatAttribivARB(hdc, 0, 0, 1, &attribute, &adapter->nCfgs)); + GL_EXTCALL(wglGetPixelFormatAttribivARB(hdc, 0, 0, 1, &attribute, &cfg_count)); + adapter->cfg_count = cfg_count; - adapter->cfgs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, adapter->nCfgs * sizeof(*adapter->cfgs)); + adapter->cfgs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, adapter->cfg_count * sizeof(*adapter->cfgs)); cfgs = adapter->cfgs; attribs[nAttribs++] = WGL_RED_BITS_ARB; attribs[nAttribs++] = WGL_GREEN_BITS_ARB; @@ -5311,7 +5313,7 @@ static BOOL InitAdapters(struct wined3d *wined3d) attribs[nAttribs++] = WGL_DOUBLE_BUFFER_ARB; attribs[nAttribs++] = WGL_AUX_BUFFERS_ARB; - for (iPixelFormat=1; iPixelFormat <= adapter->nCfgs; ++iPixelFormat) + for (iPixelFormat=1; iPixelFormat <= adapter->cfg_count; ++iPixelFormat) { res = GL_EXTCALL(wglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, nAttribs, attribs, values)); @@ -5358,7 +5360,7 @@ static BOOL InitAdapters(struct wined3d *wined3d) { int nCfgs = DescribePixelFormat(hdc, 0, 0, 0); adapter->cfgs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nCfgs * sizeof(*adapter->cfgs)); - adapter->nCfgs = 0; /* We won't accept all formats e.g. software accelerated ones will be skipped */ + adapter->cfg_count = 0; /* We won't accept all formats e.g. software accelerated ones will be skipped */ cfgs = adapter->cfgs; for(iPixelFormat=1; iPixelFormat<=nCfgs; iPixelFormat++) @@ -5399,11 +5401,13 @@ static BOOL InitAdapters(struct wined3d *wined3d) cfgs->redSize, cfgs->greenSize, cfgs->blueSize, cfgs->alphaSize, cfgs->depthSize, cfgs->stencilSize, cfgs->windowDrawable); cfgs++; - adapter->nCfgs++; + adapter->cfg_count++; } - /* Yikes we haven't found any suitable formats. This should only happen in case of GDI software rendering which we can't use anyway as its 3D functionality is very, very limited */ - if(!adapter->nCfgs) + /* We haven't found any suitable formats. This should only happen + * in case of GDI software rendering, which is pretty useless + * anyway. */ + if (!adapter->cfg_count) { ERR("Disabling Direct3D because no hardware accelerated pixel formats have been found!\n"); @@ -5423,7 +5427,7 @@ static BOOL InitAdapters(struct wined3d *wined3d) * Mark an adapter with this broken stencil behavior. */ adapter->brokenStencil = TRUE; - for (i = 0, cfgs = adapter->cfgs; i < adapter->nCfgs; ++i) + for (i = 0, cfgs = adapter->cfgs; i < adapter->cfg_count; ++i) { /* Nearly all drivers offer depth formats without stencil, only on i915 this if-statement won't be entered. */ if(cfgs[i].depthSize && !cfgs[i].stencilSize) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a398e3b..25a24e5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1524,7 +1524,7 @@ struct wined3d_adapter struct wined3d_gl_info gl_info; struct wined3d_driver_info driver_info; WCHAR DeviceName[CCHDEVICENAME]; /* DeviceName for use with e.g. ChangeDisplaySettings */ - int nCfgs; + unsigned int cfg_count; struct wined3d_pixel_format *cfgs; BOOL brokenStencil; /* Set on cards which only offer mixed depth+stencil */ unsigned int TextureRam; /* Amount of texture memory both video ram + AGP/TurboCache/HyperMemory/.. */

1 0

Hans Leidekker : msi/tests: Fix a skip message.
by Alexandre Julliard Oct. 27, 2011

Oct. 27, 2011

Module: wine Branch: master Commit: 392bd2b7a23f17d31d3609e8c57ea543d2a4175e URL: http://source.winehq.org/git/wine.git/?a=commit;h=392bd2b7a23f17d31d3609e8c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 27 13:36:21 2011 +0200 msi/tests: Fix a skip message. --- dlls/msi/tests/action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 6e35fe9..3743e50 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -4802,7 +4802,7 @@ static void test_start_services(void) ret = StartService(service, 0, NULL); if (!ret && (error = GetLastError()) != ERROR_SERVICE_ALREADY_RUNNING) { - skip("Terminal service not available, skipping test\n"); + skip("Spooler service not available, skipping test\n"); CloseServiceHandle(service); CloseServiceHandle(scm); return;

1 0

Francois Gouget : d3dx9_36/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard Oct. 27, 2011

Oct. 27, 2011

Module: wine Branch: master Commit: 9b5ed14bd8843c124af88ac75283de5f08265427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b5ed14bd8843c124af88ac75… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 27 12:30:02 2011 +0200 d3dx9_36/tests: Add a trailing '\n' to an ok() call. --- dlls/d3dx9_36/tests/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 1ccabb5..f596daf 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -9792,7 +9792,7 @@ static void test_clone_mesh(void) for (j = 0; tc[i].new_declaration[j].Stream != 0xFF; j++) { ok(memcmp(&tc[i].new_declaration[j], &new_declaration[j], sizeof(*new_declaration)) == 0, - "Test case %d failed. Declaration element %d did not match.", i, j); + "Test case %d failed. Declaration element %d did not match.\n", i, j); } /* Check declaration length */

1 0

Francois Gouget : services: Give a name to the scmdatabase critical section .
by Alexandre Julliard Oct. 27, 2011

Oct. 27, 2011

Module: wine Branch: master Commit: 97ab9cc7e537a0a042b3f128fcfefb0021f49924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97ab9cc7e537a0a042b3f128f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 27 12:36:16 2011 +0200 services: Give a name to the scmdatabase critical section. --- programs/services/services.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 2aa3683..7134ae7 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -405,6 +405,7 @@ static DWORD scmdatabase_create(struct scmdatabase **db) list_init(&(*db)->services); InitializeCriticalSection(&(*db)->cs); + (*db)->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": scmdatabase"); err = RegCreateKeyExW(HKEY_LOCAL_MACHINE, SZ_SERVICES_KEY, 0, NULL, REG_OPTION_NON_VOLATILE, MAXIMUM_ALLOWED, NULL, @@ -418,6 +419,7 @@ static DWORD scmdatabase_create(struct scmdatabase **db) static void scmdatabase_destroy(struct scmdatabase *db) { RegCloseKey(db->root_key); + db->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&db->cs); HeapFree(GetProcessHeap(), 0, db); }

1 0

Charles Davis : schannel: Don't use SSLCopyPeerCertificates on Mac OS 10.4.
by Alexandre Julliard Oct. 27, 2011

Oct. 27, 2011

Module: wine Branch: master Commit: 65634bca0be94c65e739bb00c7469c9ba27c6840 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65634bca0be94c65e739bb00c… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Wed Oct 26 22:57:30 2011 -0600 schannel: Don't use SSLCopyPeerCertificates on Mac OS 10.4. --- configure | 14 ++++++++++++++ configure.ac | 5 +++++ dlls/secur32/schannel_macosx.c | 16 ++++++++++++++++ include/config.h.in | 3 +++ 4 files changed, 38 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 48978ca..07c4ef2 100755 --- a/configure +++ b/configure @@ -6499,6 +6499,20 @@ fi then SECURITYLIB="-framework Security -framework CoreFoundation" + ac_save_LIBS="$LIBS" + LIBS="$LIBS $SECURITYLIB" + for ac_func in SSLCopyPeerCertificates +do : + ac_fn_c_check_func "$LINENO" "SSLCopyPeerCertificates" "ac_cv_func_SSLCopyPeerCertificates" +if test "x$ac_cv_func_SSLCopyPeerCertificates" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SSLCOPYPEERCERTIFICATES 1 +_ACEOF + +fi +done + + LIBS="$ac_save_LIBS" with_gnutls=${with_gnutls:-no} fi if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes" diff --git a/configure.ac b/configure.ac index ad4f36f..c4e44af 100644 --- a/configure.ac +++ b/configure.ac @@ -720,6 +720,11 @@ case $host_os in if test "$ac_cv_header_Security_Security_h" = "yes" then AC_SUBST(SECURITYLIB,"-framework Security -framework CoreFoundation") + dnl Check for the SSLCopyPeerCertificates function + ac_save_LIBS="$LIBS" + LIBS="$LIBS $SECURITYLIB" + AC_CHECK_FUNCS(SSLCopyPeerCertificates) + LIBS="$ac_save_LIBS" with_gnutls=${with_gnutls:-no} fi if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes" diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 1158b14..01493b1 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -670,6 +670,13 @@ SECURITY_STATUS schan_imp_get_connection_info(schan_imp_session session, return SEC_E_OK; } +#ifndef HAVE_SSLCOPYPEERCERTIFICATES +static void schan_imp_cf_release(const void *arg, void *ctx) +{ + CFRelease(arg); +} +#endif + SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session, PCCERT_CONTEXT *cert) { @@ -680,7 +687,11 @@ SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session TRACE("(%p/%p, %p)\n", s, s->context, cert); +#ifdef HAVE_SSLCOPYPEERCERTIFICATES status = SSLCopyPeerCertificates(s->context, &certs); +#else + status = SSLGetPeerCertificates(s->context, &certs); +#endif if (status == noErr && certs) { SecCertificateRef mac_cert; @@ -702,6 +713,11 @@ SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session } else WARN("Couldn't extract certificate data\n"); +#ifndef HAVE_SSLCOPYPEERCERTIFICATES + /* This is why SSLGetPeerCertificates was deprecated */ + CFArrayApplyFunction(certs, CFRangeMake(0, CFArrayGetCount(certs)), + schan_imp_cf_release, NULL); +#endif CFRelease(certs); } else diff --git a/include/config.h.in b/include/config.h.in index f70e354..bb13463 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -746,6 +746,9 @@ /* Define to 1 if the system has the type `ssize_t'. */ #undef HAVE_SSIZE_T +/* Define to 1 if you have the `SSLCopyPeerCertificates' function. */ +#undef HAVE_SSLCOPYPEERCERTIFICATES + /* Define to 1 if you have the `statfs' function. */ #undef HAVE_STATFS

1 0

Francois Gouget : winealsa.drv: Give a name to the mmdevapi critical sections.
by Alexandre Julliard Oct. 27, 2011

Oct. 27, 2011

Module: wine Branch: master Commit: 39e12238e95c0e793adae70e187e90a41fab08f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39e12238e95c0e793adae70e1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 27 12:36:01 2011 +0200 winealsa.drv: Give a name to the mmdevapi critical sections. Also statically initialize g_sessions_lock. --- dlls/winealsa.drv/mmdevdrv.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 29c3f72..ac5be34 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -142,6 +142,13 @@ typedef struct _SessionMgr { static HANDLE g_timer_q; static CRITICAL_SECTION g_sessions_lock; +static CRITICAL_SECTION_DEBUG g_sessions_lock_debug = +{ + 0, 0, &g_sessions_lock, + { &g_sessions_lock_debug.ProcessLocksList, &g_sessions_lock_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": g_sessions_lock") } +}; +static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, 0 }; static struct list g_sessions = LIST_INIT(g_sessions); static const WCHAR defaultW[] = {'d','e','f','a','u','l','t',0}; @@ -216,8 +223,6 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) g_timer_q = CreateTimerQueue(); if(!g_timer_q) return FALSE; - - InitializeCriticalSection(&g_sessions_lock); } return TRUE; @@ -586,6 +591,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(const char *key, IMMDevice *dev, } InitializeCriticalSection(&This->lock); + This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ACImpl.lock"); This->parent = dev; IMMDevice_AddRef(This->parent); @@ -632,6 +638,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient *iface) if(!ref){ IAudioClient_Stop(iface); IMMDevice_Release(This->parent); + This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); snd_pcm_drop(This->pcm_handle); snd_pcm_close(This->pcm_handle); @@ -744,6 +751,7 @@ static AudioSession *create_session(const GUID *guid, IMMDevice *device, list_add_head(&g_sessions, &ret->entry); InitializeCriticalSection(&ret->lock); + ret->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": AudioSession.lock"); session_init_vols(ret, num_channels);

1 0

Francois Gouget : msvcp90: Add a space before an implementation function name in the spec file.
by Alexandre Julliard Oct. 27, 2011

Oct. 27, 2011

Module: wine Branch: master Commit: 23e0ae83c26d25b4ca98be2701086bf036cd7779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23e0ae83c26d25b4ca98be270… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 27 12:31:10 2011 +0200 msvcp90: Add a space before an implementation function name in the spec file. --- dlls/msvcp90/msvcp90.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 33d5619..d137cd5 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5121,7 +5121,7 @@ @ cdecl -arch=win64 ?replace@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)_K0AEBV12@@Z(ptr long long ptr) basic_string_char_replace @ thiscall -arch=win32 ?replace@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0PBD@Z(ptr ptr ptr ptr ptr str) basic_string_char_replace_iter_cstr @ cdecl -arch=win64 ?replace@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)_K0PEBD0@Z(ptr long long ptr long) basic_string_char_replace_cstr_len -@ thiscall -arch=win32 ?replace@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0PBDI@Z(ptr ptr ptr ptr ptr str long)basic_string_char_replace_iter_cstr_len +@ thiscall -arch=win32 ?replace@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0PBDI@Z(ptr ptr ptr ptr ptr str long) basic_string_char_replace_iter_cstr_len @ cdecl -arch=win64 ?replace@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)_K0PEBD@Z(ptr long long ptr) basic_string_char_replace_cstr @ stub -arch=win32 ?replace@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAV12(a)IIABV12@@Z @ stub -arch=win64 ?replace@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAAEAV12(a)V?$_String_const_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2(a)000@Z

1 0

Hans Leidekker : msi/tests: Fix some test failures on win2k.
by Alexandre Julliard Oct. 27, 2011

Oct. 27, 2011

Module: wine Branch: master Commit: 841a747409378c72ee7a158d6f6638c790da1030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=841a747409378c72ee7a158d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 27 13:35:57 2011 +0200 msi/tests: Fix some test failures on win2k. --- dlls/msi/tests/action.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 95fc15c..6e35fe9 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -5891,14 +5891,16 @@ static void test_publish_assemblies(void) RegCloseKey(hkey); res = RegOpenKeyA(HKEY_CURRENT_USER, path_win32, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA(a)Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); + ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND /* win2k without sxs support */, + "Expected ERROR_SUCCESS, got %d\n", res); + if (res == ERROR_SUCCESS) CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA(a)Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); RegCloseKey(hkey); path = (is_wow64 || is_64bit) ? path_win32_local_wow64 : path_win32_local; res = RegOpenKeyA(HKEY_CURRENT_USER, path, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA(a)Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); + ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND /* win2k without sxs support */, + "Expected ERROR_SUCCESS, got %d\n", res); + if (res == ERROR_SUCCESS) CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA(a)Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); RegCloseKey(hkey); r = MsiInstallProductA(msifile, "REMOVE=ALL"); @@ -5952,14 +5954,16 @@ static void test_publish_assemblies(void) RegCloseKey(hkey); res = RegOpenKeyExA(HKEY_CLASSES_ROOT, classes_path_win32, 0, access, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA(a)Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); + ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND /* win2k without sxs support */, + "Expected ERROR_SUCCESS, got %d\n", res); + if (res == ERROR_SUCCESS) CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA(a)Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); RegCloseKey(hkey); path = (is_wow64 || is_64bit) ? classes_path_win32_local_wow64 : classes_path_win32_local; res = RegOpenKeyExA(HKEY_CLASSES_ROOT, path, 0, access, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA(a)Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); + ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND /* win2k without sxs support */, + "Expected ERROR_SUCCESS, got %d\n", res); + if (res == ERROR_SUCCESS) CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA(a)Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); RegCloseKey(hkey); r = MsiInstallProductA(msifile, "REMOVE=ALL ALLUSERS=1");

1 0

Hans Leidekker : msi: Wait up to 30 seconds for services to start up.
by Alexandre Julliard Oct. 27, 2011

Oct. 27, 2011

Module: wine Branch: master Commit: 319081cbf680b86e234c084942e130e99d72924e URL: http://source.winehq.org/git/wine.git/?a=commit;h=319081cbf680b86e234c08494… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 27 13:35:29 2011 +0200 msi: Wait up to 30 seconds for services to start up. --- dlls/msi/action.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 72d431a..6bc4fff 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5649,8 +5649,10 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) SC_HANDLE scm = NULL, service = NULL; LPCWSTR component, *vector = NULL; LPWSTR name, args, display_name = NULL; - DWORD event, numargs, len; + DWORD event, numargs, len, wait, dummy; UINT r = ERROR_FUNCTION_FAILED; + SERVICE_STATUS_PROCESS status; + ULONGLONG start_time; component = MSI_RecordGetString(rec, 6); comp = msi_get_loaded_component(package, component); @@ -5667,6 +5669,7 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) deformat_string(package, MSI_RecordGetString(rec, 2), &name); deformat_string(package, MSI_RecordGetString(rec, 4), &args); event = MSI_RecordGetInteger(rec, 3); + wait = MSI_RecordGetInteger(rec, 5); if (!(event & msidbServiceControlEventStart)) { @@ -5689,7 +5692,7 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) GetServiceDisplayNameW( scm, name, display_name, &len ); } - service = OpenServiceW(scm, name, SERVICE_START); + service = OpenServiceW(scm, name, SERVICE_START|SERVICE_QUERY_STATUS); if (!service) { ERR("Failed to open service %s (%u)\n", debugstr_w(name), GetLastError()); @@ -5706,6 +5709,33 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) } r = ERROR_SUCCESS; + if (wait) + { + /* wait for at most 30 seconds for the service to be up and running */ + if (!QueryServiceStatusEx(service, SC_STATUS_PROCESS_INFO, + (BYTE *)&status, sizeof(SERVICE_STATUS_PROCESS), &dummy)) + { + TRACE("failed to query service status (%u)\n", GetLastError()); + goto done; + } + start_time = GetTickCount64(); + while (status.dwCurrentState == SERVICE_START_PENDING) + { + if (GetTickCount64() - start_time > 30000) break; + Sleep(1000); + if (!QueryServiceStatusEx(service, SC_STATUS_PROCESS_INFO, + (BYTE *)&status, sizeof(SERVICE_STATUS_PROCESS), &dummy)) + { + TRACE("failed to query service status (%u)\n", GetLastError()); + goto done; + } + } + if (status.dwCurrentState != SERVICE_RUNNING) + { + WARN("service failed to start %u\n", status.dwCurrentState); + r = ERROR_FUNCTION_FAILED; + } + } done: uirow = MSI_CreateRecord( 2 );

1 0