December 2012 - Wine-Commits

Andrew Talbot : user32: Remove unneeded address-of operator from array name .
by Alexandre Julliard Dec. 7, 2012

Dec. 7, 2012

Module: wine Branch: master Commit: 51f936adc28187f0aaaacb8651b2dc3c68d3a137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51f936adc28187f0aaaacb865… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 6 22:41:45 2012 +0000 user32: Remove unneeded address-of operator from array name. --- dlls/user32/sysparams.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 08098c0..f17db6e 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1123,7 +1123,7 @@ static BOOL set_entry( void *ptr, UINT int_param, void *ptr_param, UINT flags ) #define BINARY_ENTRY(name,data) \ struct sysparam_binary_entry entry_##name = { { get_binary_entry, set_binary_entry, init_binary_entry, \ - name ##_VALNAME }, &(data), sizeof(data) } + name ##_VALNAME }, data, sizeof(data) } #define PATH_ENTRY(name) \ struct sysparam_binary_entry entry_##name = { { get_path_entry, set_path_entry, init_path_entry, \

1 0

Andrew Talbot : urlmon: Remove unneeded address-of operator from array name .
by Alexandre Julliard Dec. 7, 2012

Dec. 7, 2012

Module: wine Branch: master Commit: c1c970e0906d3bc6b193d875b67633fff02e8f8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1c970e0906d3bc6b193d875b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 6 22:41:42 2012 +0000 urlmon: Remove unneeded address-of operator from array name. --- dlls/urlmon/uri.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 0a68b43..90113f2 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -5184,7 +5184,7 @@ static HRESULT WINAPI PersistStream_Load(IPersistStream *iface, IStream *pStm) data = heap_alloc(size); if(!data) return E_OUTOFMEMORY; - hr = IStream_Read(pStm, &data->unk1, size-sizeof(DWORD)-2, NULL); + hr = IStream_Read(pStm, data->unk1, size-sizeof(DWORD)-2, NULL); if(FAILED(hr)) { heap_free(data); return hr;

1 0

Jacek Caban : msxml3: Tests code clean up.
by Alexandre Julliard Dec. 7, 2012

Dec. 7, 2012

Module: wine Branch: master Commit: b93dbb49c09b59610a4d11aaea883bb837f769d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b93dbb49c09b59610a4d11aae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 7 11:53:56 2012 +0100 msxml3: Tests code clean up. --- dlls/msxml3/tests/httpreq.c | 31 +++++++++++-------------------- 1 files changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 654749b..e3a1a91 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -114,6 +114,9 @@ static int alloced_bstrs_count; static BSTR _bstr_(const char *str) { + if(!str) + return NULL; + assert(alloced_bstrs_count < sizeof(alloced_bstrs)/sizeof(alloced_bstrs[0])); alloced_bstrs[alloced_bstrs_count] = alloc_str_from_narrow(str); return alloced_bstrs[alloced_bstrs_count++]; @@ -1431,7 +1434,6 @@ static void test_XMLHTTP(void) BSTR bstrResponse, str, str1; VARIANT varbody, varbody_ref; VARIANT dummy; - VARIANT async; LONG state, status, bound; IDispatch *event; void *ptr; @@ -1443,9 +1445,6 @@ static void test_XMLHTTP(void) VariantInit(&dummy); V_VT(&dummy) = VT_ERROR; V_ERROR(&dummy) = DISP_E_MEMBERNOTFOUND; - VariantInit(&async); - V_VT(&async) = VT_BOOL; - V_BOOL(&async) = VARIANT_FALSE; hr = IXMLHttpRequest_put_onreadystatechange(xhr, NULL); EXPECT_HR(hr, S_OK); @@ -1484,14 +1483,9 @@ static void test_XMLHTTP(void) ok(hr == E_FAIL, "got 0x%08x\n", hr); /* invalid parameters */ - hr = IXMLHttpRequest_open(xhr, NULL, NULL, async, dummy, dummy); - EXPECT_HR(hr, E_INVALIDARG); - - hr = IXMLHttpRequest_open(xhr, _bstr_("POST"), NULL, async, dummy, dummy); - EXPECT_HR(hr, E_INVALIDARG); - - hr = IXMLHttpRequest_open(xhr, NULL, _bstr_(urlA), async, dummy, dummy); - EXPECT_HR(hr, E_INVALIDARG); + test_open(xhr, NULL, NULL, E_INVALIDARG); + test_open(xhr, "POST", NULL, E_INVALIDARG); + test_open(xhr, NULL, urlA, E_INVALIDARG); hr = IXMLHttpRequest_setRequestHeader(xhr, NULL, NULL); EXPECT_HR(hr, E_INVALIDARG); @@ -1522,8 +1516,7 @@ static void test_XMLHTTP(void) g_unexpectedcall = g_expectedcall = 0; - hr = IXMLHttpRequest_open(xhr, _bstr_("POST"), _bstr_(urlA), async, dummy, dummy); - EXPECT_HR(hr, S_OK); + test_open(xhr, "POST", urlA, S_OK); ok(g_unexpectedcall == 0, "unexpected disp event call\n"); ok(g_expectedcall == 1 || broken(g_expectedcall == 0) /* win2k */, "no expected disp event call\n"); @@ -1548,8 +1541,7 @@ static void test_XMLHTTP(void) ok(state == READYSTATE_UNINITIALIZED || broken(state == READYSTATE_LOADING) /* win2k */, "got %d, expected READYSTATE_UNINITIALIZED\n", state); - hr = IXMLHttpRequest_open(xhr, _bstr_("POST"), _bstr_(urlA), async, dummy, dummy); - EXPECT_HR(hr, S_OK); + test_open(xhr, "POST", urlA, S_OK); hr = IXMLHttpRequest_setRequestHeader(xhr, _bstr_("header1"), _bstr_("value1")); EXPECT_HR(hr, S_OK); @@ -1628,16 +1620,15 @@ static void test_XMLHTTP(void) } /* POST: VT_VARIANT|VT_BYREF body */ + test_open(xhr, "POST", urlA, S_OK); + V_VT(&varbody_ref) = VT_VARIANT|VT_BYREF; V_VARIANTREF(&varbody_ref) = &varbody; - hr = IXMLHttpRequest_open(xhr, _bstr_("POST"), _bstr_(urlA), async, dummy, dummy); - EXPECT_HR(hr, S_OK); hr = IXMLHttpRequest_send(xhr, varbody_ref); EXPECT_HR(hr, S_OK); /* GET request */ - hr = IXMLHttpRequest_open(xhr, _bstr_("GET"), _bstr_(xmltestA), async, dummy, dummy); - EXPECT_HR(hr, S_OK); + test_open(xhr, "GET", xmltestA, S_OK); V_VT(&varbody) = VT_EMPTY;

1 0

Alexandre Julliard : gdi32: Keep track of the number of fonts on the unused list.
by Alexandre Julliard Dec. 7, 2012

Dec. 7, 2012

Module: wine Branch: master Commit: 06dced4eaae078ea701eb8bb593075801fff75ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=06dced4eaae078ea701eb8bb5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 7 14:36:22 2012 +0100 gdi32: Keep track of the number of fonts on the unused list. --- dlls/gdi32/freetype.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 5cf34ca..ce8bbd9 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -375,6 +375,7 @@ struct enum_charset_list { static struct list gdi_font_list = LIST_INIT(gdi_font_list); static struct list unused_gdi_font_list = LIST_INIT(unused_gdi_font_list); +static unsigned int unused_font_count; #define UNUSED_CACHE_SIZE 10 static struct list system_links = LIST_INIT(system_links); @@ -4307,6 +4308,7 @@ static GdiFont *find_in_cache(HFONT hfont, const LOGFONTW *plf, const FMAT2 *pma hflist = HeapAlloc(GetProcessHeap(), 0, sizeof(*hflist)); hflist->hfont = hfont; list_add_head(&ret->hfontlist, &hflist->entry); + unused_font_count--; return ret; } return NULL; @@ -5021,7 +5023,6 @@ BOOL WineEngDestroyFontInstance(HFONT handle) GdiFont *gdiFont, *next; HFONTLIST *hflist, *hfnext; BOOL ret = FALSE; - int i = 0; GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); @@ -5044,17 +5045,16 @@ BOOL WineEngDestroyFontInstance(HFONT handle) TRACE("Moving to Unused list\n"); list_remove(&gdiFont->entry); list_add_head(&unused_gdi_font_list, &gdiFont->entry); + if (unused_font_count > UNUSED_CACHE_SIZE) + { + gdiFont = LIST_ENTRY( list_tail( &unused_gdi_font_list ), struct tagGdiFont, entry ); + TRACE("freeing %p\n", gdiFont); + list_remove(&gdiFont->entry); + free_font(gdiFont); + } + else unused_font_count++; } } - - - LIST_FOR_EACH_ENTRY_SAFE( gdiFont, next, &unused_gdi_font_list, struct tagGdiFont, entry ) - { - if (i++ < UNUSED_CACHE_SIZE) continue; - TRACE("freeing %p\n", gdiFont); - list_remove(&gdiFont->entry); - free_font(gdiFont); - } LeaveCriticalSection( &freetype_cs ); return ret; }

1 0

Henri Verbeet : ddraw: Avoid LPDDSURFACEDESC.
by Alexandre Julliard Dec. 7, 2012

Dec. 7, 2012

Module: wine Branch: master Commit: b1186d71c2dfe287068563da3e59bfd6c05271a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1186d71c2dfe287068563da3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 7 00:07:05 2012 +0100 ddraw: Avoid LPDDSURFACEDESC. --- dlls/ddraw/tests/ddrawmodes.c | 10 +++++----- dlls/ddraw/tests/visual.c | 2 +- include/d3dtypes.h | 2 +- include/ddraw.h | 40 +++++++++++++++++++++++----------------- include/ddrawi.h | 4 ++-- 5 files changed, 32 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1186d71c2dfe28706856…

1 0

Andrew Talbot : windowscodecs: Remove unneeded address-of operators from array names.
by Alexandre Julliard Dec. 7, 2012

Dec. 7, 2012

Module: wine Branch: master Commit: 4bb2c61b39668a02f68e859afc2a8de7aa434b6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bb2c61b39668a02f68e859af… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 6 22:41:52 2012 +0000 windowscodecs: Remove unneeded address-of operators from array names. --- dlls/windowscodecs/gifformat.c | 2 +- dlls/windowscodecs/jpegformat.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index ce63af9..84838e2 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -1362,7 +1362,7 @@ static HRESULT WINAPI GifDecoder_Block_GetReaderByIndex(IWICMetadataBlockReader if (!reader) return E_INVALIDARG; if (index == 0) - return create_metadata_reader(&This->LSD_data, sizeof(This->LSD_data), + return create_metadata_reader(This->LSD_data, sizeof(This->LSD_data), &CLSID_WICLSDMetadataReader, reader); for (i = 0; i < This->gif->Extensions.ExtensionBlockCount; i++) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 57f1b55..6463de5 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -1022,7 +1022,7 @@ static HRESULT WINAPI JpegEncoder_Frame_WritePixels(IWICBitmapFrameEncode *iface HeapFree(GetProcessHeap(), 0, swapped_data); return E_FAIL; } - This->cinfo.client_data = &jmpbuf; + This->cinfo.client_data = jmpbuf; if (!This->started_compress) { @@ -1189,7 +1189,7 @@ static HRESULT WINAPI JpegEncoder_Frame_Commit(IWICBitmapFrameEncode *iface) LeaveCriticalSection(&This->lock); return E_FAIL; } - This->cinfo.client_data = &jmpbuf; + This->cinfo.client_data = jmpbuf; pjpeg_finish_compress(&This->cinfo); @@ -1299,7 +1299,7 @@ static HRESULT WINAPI JpegEncoder_Initialize(IWICBitmapEncoder *iface, This->cinfo.err = &This->jerr; - This->cinfo.client_data = &jmpbuf; + This->cinfo.client_data = jmpbuf; if (setjmp(jmpbuf)) {

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_GSSetSamplers().
by Alexandre Julliard Dec. 7, 2012

Dec. 7, 2012

Module: wine Branch: master Commit: 047d607e07df54be04a8c11511a14ccc7632130b URL: http://source.winehq.org/git/wine.git/?a=commit;h=047d607e07df54be04a8c1151… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 7 00:07:07 2012 +0100 d3d10core: Implement d3d10_device_GSSetSamplers(). --- dlls/d3d10core/device.c | 13 ++++++++++++- dlls/wined3d/device.c | 21 +++++++++++++++++++++ dlls/wined3d/stateblock.c | 9 +++++++++ dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 1 + 6 files changed, 45 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index ad07aee..0aa5f47 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -357,8 +357,19 @@ static void STDMETHODCALLTYPE d3d10_device_GSSetShaderResources(ID3D10Device *if static void STDMETHODCALLTYPE d3d10_device_GSSetSamplers(ID3D10Device *iface, UINT start_slot, UINT sampler_count, ID3D10SamplerState *const *samplers) { - FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", iface, start_slot, sampler_count, samplers); + + for (i = 0; i < sampler_count; ++i) + { + struct d3d10_sampler_state *sampler = unsafe_impl_from_ID3D10SamplerState(samplers[i]); + + wined3d_device_set_gs_sampler(device->wined3d_device, start_slot + i, + sampler ? sampler->wined3d_sampler : NULL); + } } static void STDMETHODCALLTYPE d3d10_device_OMSetRenderTargets(ID3D10Device *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 24c6b4e..ed243cc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3267,6 +3267,27 @@ struct wined3d_buffer * CDECL wined3d_device_get_gs_cb(const struct wined3d_devi return device->stateBlock->state.gs_cb[idx]; } +void CDECL wined3d_device_set_gs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler) +{ + struct wined3d_sampler *prev; + + TRACE("device %p, idx %u, sampler %p.\n", device, idx, sampler); + + if (idx >= MAX_SAMPLER_OBJECTS) + { + WARN("Invalid sampler index %u.\n", idx); + return; + } + + prev = device->updateStateBlock->state.gs_sampler[idx]; + device->updateStateBlock->state.gs_sampler[idx] = sampler; + + if (sampler) + wined3d_sampler_incref(sampler); + if (prev) + wined3d_sampler_decref(prev); +} + /* Context activation is done by the caller. */ /* Do not call while under the GL lock. */ #define copy_and_next(dest, src, size) memcpy(dest, src, size); dest += (size) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 0b55f18..45118f4 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -555,6 +555,15 @@ void stateblock_unbind_resources(struct wined3d_stateblock *stateblock) } } + for (i = 0; i < MAX_SAMPLER_OBJECTS; ++i) + { + if ((sampler = state->gs_sampler[i])) + { + state->gs_sampler[i] = NULL; + wined3d_sampler_decref(sampler); + } + } + if ((shader = state->pixel_shader)) { state->pixel_shader = NULL; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 0b87f10..1ac4bf5 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -120,6 +120,7 @@ @ cdecl wined3d_device_set_gamma_ramp(ptr long long ptr) @ cdecl wined3d_device_set_geometry_shader(ptr ptr) @ cdecl wined3d_device_set_gs_cb(ptr long ptr) +@ cdecl wined3d_device_set_gs_sampler(ptr long ptr) @ cdecl wined3d_device_set_index_buffer(ptr ptr long) @ cdecl wined3d_device_set_light(ptr long ptr) @ cdecl wined3d_device_set_light_enable(ptr long long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c347068..64da8e5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2315,6 +2315,7 @@ struct wined3d_state struct wined3d_shader *geometry_shader; struct wined3d_buffer *gs_cb[MAX_CONSTANT_BUFFERS]; + struct wined3d_sampler *gs_sampler[MAX_SAMPLER_OBJECTS]; struct wined3d_shader *pixel_shader; struct wined3d_buffer *ps_cb[MAX_CONSTANT_BUFFERS]; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index cc60893..eb48ceb 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2211,6 +2211,7 @@ void __cdecl wined3d_device_set_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, DWORD flags, const struct wined3d_gamma_ramp *ramp); void __cdecl wined3d_device_set_geometry_shader(struct wined3d_device *device, struct wined3d_shader *shader); void __cdecl wined3d_device_set_gs_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer); +void __cdecl wined3d_device_set_gs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler); void __cdecl wined3d_device_set_index_buffer(struct wined3d_device *device, struct wined3d_buffer *index_buffer, enum wined3d_format_id format_id); HRESULT __cdecl wined3d_device_set_light(struct wined3d_device *device,

1 0

André Hentschel : secur32/tests: Fix tests on win8.
by Alexandre Julliard Dec. 7, 2012

Dec. 7, 2012

Module: wine Branch: master Commit: 1eaa25696b1f7b487bfc246dd029a588b14b010e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eaa25696b1f7b487bfc246dd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 6 19:28:55 2012 +0100 secur32/tests: Fix tests on win8. --- dlls/secur32/tests/negotiate.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/tests/negotiate.c b/dlls/secur32/tests/negotiate.c index 9aca5b6..e70c1e8 100644 --- a/dlls/secur32/tests/negotiate.c +++ b/dlls/secur32/tests/negotiate.c @@ -329,7 +329,9 @@ static void test_authentication(void) { ok( pi->fCapabilities == NTLM_BASE_CAPS || pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_READONLY_WITH_CHECKSUM) || - pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS), + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS) || + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS| + SECPKG_FLAG_APPCONTAINER_CHECKS), "got %08x\n", pi->fCapabilities ); ok( pi->wVersion == 1, "got %u\n", pi->wVersion ); ok( pi->wRPCID == RPC_C_AUTHN_WINNT, "got %u\n", pi->wRPCID ); @@ -372,7 +374,9 @@ START_TEST(negotiate) } ok( info->fCapabilities == NEGOTIATE_BASE_CAPS || info->fCapabilities == (NEGOTIATE_BASE_CAPS|SECPKG_FLAG_READONLY_WITH_CHECKSUM) || - info->fCapabilities == (NEGOTIATE_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS), + info->fCapabilities == (NEGOTIATE_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS) || + info->fCapabilities == (NEGOTIATE_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS| + SECPKG_FLAG_APPCONTAINER_CHECKS), "got %08x\n", info->fCapabilities ); ok( info->wVersion == 1, "got %u\n", info->wVersion ); ok( info->wRPCID == RPC_C_AUTHN_GSS_NEGOTIATE, "got %u\n", info->wRPCID );

1 0

André Hentschel : schannel/tests: Fix test on win8.
by Alexandre Julliard Dec. 7, 2012

Dec. 7, 2012

Module: wine Branch: master Commit: 30fd27e1173cc6ace459f2aa100fe6b84367dd98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30fd27e1173cc6ace459f2aa1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 6 19:28:08 2012 +0100 schannel/tests: Fix test on win8. --- dlls/schannel/tests/main.c | 18 +++++++++++++++--- include/sspi.h | 4 ++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index b576848..83c107a 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -45,6 +45,17 @@ ValidateTargetInfo) #define SECPKG_FUNCTION_TABLE_SIZE_6 sizeof(SECPKG_FUNCTION_TABLE) +#define LSA_BASE_CAPS ( \ + SECPKG_FLAG_INTEGRITY | \ + SECPKG_FLAG_PRIVACY | \ + SECPKG_FLAG_CONNECTION | \ + SECPKG_FLAG_MULTI_REQUIRED | \ + SECPKG_FLAG_EXTENDED_ERROR | \ + SECPKG_FLAG_IMPERSONATION | \ + SECPKG_FLAG_ACCEPT_WIN32_NAME | \ + SECPKG_FLAG_STREAM | \ + SECPKG_FLAG_MUTUAL_AUTH ) + static NTSTATUS (NTAPI *pSpLsaModeInitialize)(ULONG, PULONG, PSECPKG_FUNCTION_TABLE*, PULONG); static NTSTATUS (NTAPI *pSpUserModeInitialize)(ULONG, PULONG, @@ -179,8 +190,9 @@ static void testGetInfo(void) /* First package: Unified */ status = pTables->GetInfo(&PackageInfo); ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); - ok(PackageInfo.fCapabilities == 0x107b3, "fCapabilities: 0x%x\n", - PackageInfo.fCapabilities); + ok(PackageInfo.fCapabilities == LSA_BASE_CAPS || + PackageInfo.fCapabilities == (LSA_BASE_CAPS|SECPKG_FLAG_APPCONTAINER_PASSTHROUGH), + "fCapabilities: 0x%x\n", PackageInfo.fCapabilities); ok(PackageInfo.wVersion == 1, "wVersion: %d\n", PackageInfo.wVersion); ok(PackageInfo.wRPCID == 14, "wRPCID: %d\n", PackageInfo.wRPCID); ok(PackageInfo.cbMaxToken == 0x4000 || @@ -204,7 +216,7 @@ static void testGetInfo(void) if (status == STATUS_SUCCESS) { - ok(PackageInfo.fCapabilities == 0x107b3, "fCapabilities: 0x%x\n", + ok(PackageInfo.fCapabilities == LSA_BASE_CAPS, "fCapabilities: 0x%x\n", PackageInfo.fCapabilities); ok(PackageInfo.wVersion == 1, "wVersion: %d\n", PackageInfo.wVersion); ok(PackageInfo.wRPCID == 14, "wRPCID: %d\n", PackageInfo.wRPCID); diff --git a/include/sspi.h b/include/sspi.h index bd2241c..74bfd2f 100644 --- a/include/sspi.h +++ b/include/sspi.h @@ -131,6 +131,10 @@ typedef struct _SecPkgInfoW #define SECPKG_FLAG_DELEGATION 0x00020000 #define SECPKG_FLAG_READONLY_WITH_CHECKSUM 0x00040000 #define SECPKG_FLAG_RESTRICTED_TOKENS 0x00080000 +#define SECPKG_FLAG_NEGO_EXTENDER 0x00100000 +#define SECPKG_FLAG_NEGOTIABLE2 0x00200000 +#define SECPKG_FLAG_APPCONTAINER_PASSTHROUGH 0x00400000 +#define SECPKG_FLAG_APPCONTAINER_CHECKS 0x00800000 #define SECPKG_ID_NONE 0xffff

1 0

Jacek Caban : jscript: Added more useful debug traces.
by Alexandre Julliard Dec. 7, 2012

Dec. 7, 2012

Module: wine Branch: master Commit: e8766bb66f7f52993580b5a9f767ddf92a683621 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8766bb66f7f52993580b5a9f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 7 11:57:42 2012 +0100 jscript: Added more useful debug traces. --- dlls/jscript/activex.c | 2 ++ dlls/jscript/engine.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/activex.c b/dlls/jscript/activex.c index c7b4e0a..58c2574 100644 --- a/dlls/jscript/activex.c +++ b/dlls/jscript/activex.c @@ -70,6 +70,8 @@ static IUnknown *create_activex_object(script_ctx_t *ctx, const WCHAR *progid) GUID guid; HRESULT hres; + TRACE("%s\n", debugstr_w(progid)); + hres = CLSIDFromProgID(progid, &guid); if(FAILED(hres)) return NULL; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 3fedea1..b62e5a6 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2458,7 +2458,7 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, bytecode_t *code, function_code op = code->instrs[exec_ctx->ip].op; hres = op_funcs[op](exec_ctx); if(FAILED(hres)) { - TRACE("EXCEPTION\n"); + TRACE("EXCEPTION %08x\n", hres); if(!exec_ctx->except_frame) break;

1 0