August 2013 - Wine-Commits - list.winehq.org

Vincent Povirk : msvcrt: _[w]access_s returns an error code.
by Alexandre Julliard Aug. 22, 2013

Aug. 22, 2013

Module: wine Branch: master Commit: 5f2e48f737ecfa2e397d1148474824fcb70f4d9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f2e48f737ecfa2e397d11484… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 21 15:13:36 2013 -0500 msvcrt: _[w]access_s returns an error code. --- dlls/msvcr90/tests/msvcr90.c | 82 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/file.c | 16 +++++--- 2 files changed, 92 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index e4eee04..fa2b445 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -111,6 +111,7 @@ static int (__cdecl *p_vswprintf_l)(wchar_t*, const wchar_t*, _locale_t, __ms_va static FILE* (__cdecl *p_fopen)(const char*, const char*); static int (__cdecl *p_fclose)(FILE*); static int (__cdecl *p_unlink)(const char*); +static int (__cdecl *p_access_s)(const char*, int); static void (__cdecl *p_lock_file)(FILE*); static void (__cdecl *p_unlock_file)(FILE*); static int (__cdecl *p_fileno)(FILE*); @@ -298,6 +299,7 @@ static BOOL init(void) SET(p_fopen, "fopen"); SET(p_fclose, "fclose"); SET(p_unlink, "_unlink"); + SET(p_access_s, "_access_s"); SET(p_lock_file, "_lock_file"); SET(p_unlock_file, "_unlock_file"); SET(p_fileno, "_fileno"); @@ -1217,6 +1219,85 @@ static void test_byteswap(void) ok(ret == 0, "ret = %lx\n", ret); } +static void test_access_s(void) +{ + FILE *f; + int res; + + f = p_fopen("test_file", "w"); + ok(f != NULL, "unable to create test file\n"); + if(!f) + return; + + p_fclose(f); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 0); + ok(res == 0, "got %x\n", res); + ok(errno == 0xdeadbeef, "got %x\n", res); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 2); + ok(res == 0, "got %x\n", res); + ok(errno == 0xdeadbeef, "got %x\n", res); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 4); + ok(res == 0, "got %x\n", res); + ok(errno == 0xdeadbeef, "got %x\n", res); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 6); + ok(res == 0, "got %x\n", res); + ok(errno == 0xdeadbeef, "got %x\n", res); + + SetFileAttributesA("test_file", FILE_ATTRIBUTE_READONLY); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 0); + ok(res == 0, "got %x\n", res); + ok(errno == 0xdeadbeef, "got %x\n", res); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 2); + ok(res == EACCES, "got %x\n", res); + ok(errno == EACCES, "got %x\n", res); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 4); + ok(res == 0, "got %x\n", res); + ok(errno == 0xdeadbeef, "got %x\n", res); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 6); + ok(res == EACCES, "got %x\n", res); + ok(errno == EACCES, "got %x\n", res); + + SetFileAttributesA("test_file", FILE_ATTRIBUTE_NORMAL); + + p_unlink("test_file"); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 0); + ok(res == ENOENT, "got %x\n", res); + ok(errno == ENOENT, "got %x\n", res); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 2); + ok(res == ENOENT, "got %x\n", res); + ok(errno == ENOENT, "got %x\n", res); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 4); + ok(res == ENOENT, "got %x\n", res); + ok(errno == ENOENT, "got %x\n", res); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 6); + ok(res == ENOENT, "got %x\n", res); + ok(errno == ENOENT, "got %x\n", res); +} + START_TEST(msvcr90) { if(!init()) @@ -1242,4 +1323,5 @@ START_TEST(msvcr90) test__vswprintf_l(); test_nonblocking_file_access(); test_byteswap(); + test_access_s(); } diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 871027d..0054222 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -715,10 +715,12 @@ int CDECL MSVCRT__access(const char *filename, int mode) */ int CDECL _access_s(const char *filename, int mode) { - if (!MSVCRT_CHECK_PMT(filename != NULL)) return -1; - if (!MSVCRT_CHECK_PMT((mode & ~(MSVCRT_R_OK | MSVCRT_W_OK)) == 0)) return -1; + if (!MSVCRT_CHECK_PMT(filename != NULL)) return *MSVCRT__errno(); + if (!MSVCRT_CHECK_PMT((mode & ~(MSVCRT_R_OK | MSVCRT_W_OK)) == 0)) return *MSVCRT__errno(); - return MSVCRT__access(filename, mode); + if (MSVCRT__access(filename, mode) == -1) + return *MSVCRT__errno(); + return 0; } /********************************************************************* @@ -748,10 +750,12 @@ int CDECL MSVCRT__waccess(const MSVCRT_wchar_t *filename, int mode) */ int CDECL _waccess_s(const MSVCRT_wchar_t *filename, int mode) { - if (!MSVCRT_CHECK_PMT(filename != NULL)) return -1; - if (!MSVCRT_CHECK_PMT((mode & ~(MSVCRT_R_OK | MSVCRT_W_OK)) == 0)) return -1; + if (!MSVCRT_CHECK_PMT(filename != NULL)) return *MSVCRT__errno(); + if (!MSVCRT_CHECK_PMT((mode & ~(MSVCRT_R_OK | MSVCRT_W_OK)) == 0)) return *MSVCRT__errno(); - return MSVCRT__waccess(filename, mode); + if (MSVCRT__waccess(filename, mode) == -1) + return *MSVCRT__errno(); + return 0; } /*********************************************************************

1 0

Henri Verbeet : wined3d: Read from stateBlock instead of updateStateBlock in wined3d_device_get_material ().
by Alexandre Julliard Aug. 22, 2013

Aug. 22, 2013

Module: wine Branch: master Commit: 7638e550b9e6377204d7916822d4cc7526082dfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7638e550b9e6377204d791682… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 22 09:48:39 2013 +0200 wined3d: Read from stateBlock instead of updateStateBlock in wined3d_device_get_material(). --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e16a4b8..c949a9c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2098,7 +2098,7 @@ void CDECL wined3d_device_get_material(const struct wined3d_device *device, stru { TRACE("device %p, material %p.\n", device, material); - *material = device->updateStateBlock->state.material; + *material = device->stateBlock->state.material; TRACE("diffuse {%.8e, %.8e, %.8e, %.8e}\n", material->diffuse.r, material->diffuse.g,

1 0

Nikolay Sivov : ole32: Fix IClassFactory initialization and QueryInterface behavior for GIT.
by Alexandre Julliard Aug. 22, 2013

Aug. 22, 2013

Module: wine Branch: master Commit: 43d5d86716e46d438b65446ea5fb799ec9122976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43d5d86716e46d438b65446ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 22 00:00:39 2013 +0400 ole32: Fix IClassFactory initialization and QueryInterface behavior for GIT. --- dlls/ole32/git.c | 8 ++++---- dlls/ole32/tests/marshal.c | 11 +++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index f5dd00b..f0be9ee 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -311,8 +311,8 @@ static HRESULT WINAPI GITCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid, LPVOID *ppv) { *ppv = NULL; - if (IsEqualIID(riid,&IID_IUnknown) || - IsEqualIID(riid,&IID_IGlobalInterfaceTable)) + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IClassFactory)) { *ppv = iface; return S_OK; @@ -357,11 +357,11 @@ static const IClassFactoryVtbl GITClassFactoryVtbl = { GITCF_LockServer }; -static const IClassFactoryVtbl *PGITClassFactoryVtbl = &GITClassFactoryVtbl; +static IClassFactory git_classfactory = { &GITClassFactoryVtbl }; HRESULT StdGlobalInterfaceTable_GetFactory(LPVOID *ppv) { - *ppv = &PGITClassFactoryVtbl; + *ppv = &git_classfactory; TRACE("Returning GIT classfactory\n"); return S_OK; } diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 2baec4b..9566de3 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -40,6 +40,7 @@ DEFINE_GUID(CLSID_ManualResetEvent, 0x0000032c,0x0000,0x0000,0xc0,0x00,0x0 /* functions that are not present on all versions of Windows */ static HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit); +static HRESULT (WINAPI *pDllGetClassObject)(REFCLSID,REFIID,LPVOID); /* helper macros to make tests a bit leaner */ #define ok_more_than_one_lock() ok(cLocks > 0, "Number of locks should be > 0, but actually is %d\n", cLocks) @@ -2804,10 +2805,19 @@ static void test_globalinterfacetable(void) struct git_params params; DWORD ret; IUnknown *object; + IClassFactory *cf; trace("test_globalinterfacetable\n"); cLocks = 0; + hr = pDllGetClassObject(&CLSID_StdGlobalInterfaceTable, &IID_IClassFactory, (void**)&cf); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IClassFactory_QueryInterface(cf, &IID_IGlobalInterfaceTable, (void**)&object); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + IClassFactory_Release(cf); + hr = CoCreateInstance(&CLSID_StdGlobalInterfaceTable, NULL, CLSCTX_INPROC_SERVER, &IID_IGlobalInterfaceTable, (void **)&git); ok_ole_success(hr, CoCreateInstance); @@ -3149,6 +3159,7 @@ START_TEST(marshal) } pCoInitializeEx = (void*)GetProcAddress(hOle32, "CoInitializeEx"); + pDllGetClassObject = (void*)GetProcAddress(hOle32, "DllGetClassObject"); argc = winetest_get_mainargs( &argv ); if (argc > 2 && (!strcmp(argv[2], "-Embedding")))

1 0

Henri Verbeet : d3dx9: Get rid of the ID3DXMatrixStack_Vtbl forward declaration.
by Alexandre Julliard Aug. 22, 2013

Aug. 22, 2013

Module: wine Branch: master Commit: 6ea59b91577e230bb529e23567328cdf083e7f43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ea59b91577e230bb529e2356… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 22 09:48:43 2013 +0200 d3dx9: Get rid of the ID3DXMatrixStack_Vtbl forward declaration. --- dlls/d3dx9_36/math.c | 68 +++++++++++++++++++++++-------------------------- 1 files changed, 32 insertions(+), 36 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index e0cab9e..f6a43a0 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -35,8 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); -static const ID3DXMatrixStackVtbl ID3DXMatrixStack_Vtbl; - struct ID3DXMatrixStackImpl { ID3DXMatrixStack ID3DXMatrixStack_iface; @@ -47,6 +45,7 @@ struct ID3DXMatrixStackImpl D3DXMATRIX *stack; }; +static const unsigned int INITIAL_STACK_SIZE = 32; /*_________________D3DXColor____________________*/ @@ -930,40 +929,6 @@ D3DXMATRIX* WINAPI D3DXMatrixTranspose(D3DXMATRIX *pout, const D3DXMATRIX *pm) /*_________________D3DXMatrixStack____________________*/ -static const unsigned int INITIAL_STACK_SIZE = 32; - -HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, ID3DXMatrixStack **ppstack) -{ - struct ID3DXMatrixStackImpl *object; - - TRACE("flags %#x, ppstack %p\n", flags, ppstack); - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (object == NULL) - { - *ppstack = NULL; - return E_OUTOFMEMORY; - } - object->ID3DXMatrixStack_iface.lpVtbl = &ID3DXMatrixStack_Vtbl; - object->ref = 1; - - object->stack = HeapAlloc(GetProcessHeap(), 0, INITIAL_STACK_SIZE * sizeof(*object->stack)); - if (!object->stack) - { - HeapFree(GetProcessHeap(), 0, object); - *ppstack = NULL; - return E_OUTOFMEMORY; - } - - object->current = 0; - object->stack_size = INITIAL_STACK_SIZE; - D3DXMatrixIdentity(&object->stack[0]); - - TRACE("Created matrix stack %p\n", object); - - *ppstack = &object->ID3DXMatrixStack_iface; - return D3D_OK; -} static inline struct ID3DXMatrixStackImpl *impl_from_ID3DXMatrixStack(ID3DXMatrixStack *iface) { @@ -1243,6 +1208,37 @@ static const ID3DXMatrixStackVtbl ID3DXMatrixStack_Vtbl = ID3DXMatrixStackImpl_GetTop }; +HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, ID3DXMatrixStack **stack) +{ + struct ID3DXMatrixStackImpl *object; + + TRACE("flags %#x, stack %p.\n", flags, stack); + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + { + *stack = NULL; + return E_OUTOFMEMORY; + } + object->ID3DXMatrixStack_iface.lpVtbl = &ID3DXMatrixStack_Vtbl; + object->ref = 1; + + if (!(object->stack = HeapAlloc(GetProcessHeap(), 0, INITIAL_STACK_SIZE * sizeof(*object->stack)))) + { + HeapFree(GetProcessHeap(), 0, object); + *stack = NULL; + return E_OUTOFMEMORY; + } + + object->current = 0; + object->stack_size = INITIAL_STACK_SIZE; + D3DXMatrixIdentity(&object->stack[0]); + + TRACE("Created matrix stack %p.\n", object); + + *stack = &object->ID3DXMatrixStack_iface; + return D3D_OK; +} + /*_________________D3DXPLANE________________*/ D3DXPLANE* WINAPI D3DXPlaneFromPointNormal(D3DXPLANE *pout, const D3DXVECTOR3 *pvpoint, const D3DXVECTOR3 *pvnormal)

1 0

Jacek Caban : crypt32: Added a test showing that CertGetCertificateChain should use global store.
by Alexandre Julliard Aug. 21, 2013

Aug. 21, 2013

Module: wine Branch: master Commit: 8ef3a142263e6db11f1514f77b3de84c8b08d7a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ef3a142263e6db11f1514f77… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 21 18:57:29 2013 +0200 crypt32: Added a test showing that CertGetCertificateChain should use global store. --- dlls/crypt32/tests/chain.c | 166 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 166 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ef3a142263e6db11f151…

1 0

Stefan Dösinger : wined3d: Move volume booleans into a flags field.
by Alexandre Julliard Aug. 21, 2013

Aug. 21, 2013

Module: wine Branch: master Commit: 7e7ee524864c4d24c02148061d1160cba63eda18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e7ee524864c4d24c02148061… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 21 15:15:50 2013 +0200 wined3d: Move volume booleans into a flags field. --- dlls/wined3d/volume.c | 10 +++------- dlls/wined3d/wined3d_private.h | 8 +++++--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index cdc7125..4c6bd4d 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -49,7 +49,6 @@ static void volume_bind_and_dirtify(const struct wined3d_volume *volume, struct void volume_add_dirty_box(struct wined3d_volume *volume, const struct wined3d_box *dirty_box) { - volume->dirty = TRUE; if (dirty_box) { volume->lockedBox.left = min(volume->lockedBox.left, dirty_box->left); @@ -233,7 +232,7 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, wined3d_texture_set_dirty(volume->container, TRUE); } - volume->locked = TRUE; + volume->flags |= WINED3D_VFLAG_LOCKED; TRACE("Returning memory %p, row pitch %d, slice pitch %d.\n", map_desc->data, map_desc->row_pitch, map_desc->slice_pitch); @@ -250,13 +249,13 @@ HRESULT CDECL wined3d_volume_unmap(struct wined3d_volume *volume) { TRACE("volume %p.\n", volume); - if (!volume->locked) + if (!(volume->flags & WINED3D_VFLAG_LOCKED)) { WARN("Trying to unlock unlocked volume %p.\n", volume); return WINED3DERR_INVALIDCALL; } - volume->locked = FALSE; + volume->flags &= ~WINED3D_VFLAG_LOCKED; memset(&volume->lockedBox, 0, sizeof(volume->lockedBox)); return WINED3D_OK; @@ -293,10 +292,7 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_device return hr; } - volume->lockable = TRUE; - volume->locked = FALSE; memset(&volume->lockedBox, 0, sizeof(volume->lockedBox)); - volume->dirty = TRUE; volume_add_dirty_box(volume, NULL); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b96defb..7ed32ae 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2050,15 +2050,17 @@ void wined3d_texture_apply_state_changes(struct wined3d_texture *texture, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void wined3d_texture_set_dirty(struct wined3d_texture *texture, BOOL dirty) DECLSPEC_HIDDEN; +#define WINED3D_VFLAG_LOCKED 0x00000001 + struct wined3d_volume { struct wined3d_resource resource; struct wined3d_texture *container; - BOOL lockable; - BOOL locked; + struct wined3d_box lockedBox; struct wined3d_box dirtyBox; - BOOL dirty; + + DWORD flags; }; static inline struct wined3d_volume *volume_from_resource(struct wined3d_resource *resource)

1 0

Hans Leidekker : wbemprox: Accept the root\default namespace.
by Alexandre Julliard Aug. 21, 2013

Aug. 21, 2013

Module: wine Branch: master Commit: d799a664f46623282b6173ff8bcf5562444a30d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d799a664f46623282b6173ff8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 21 14:09:28 2013 +0200 wbemprox: Accept the root\default namespace. --- dlls/wbemprox/tests/services.c | 8 +++++++- dlls/wbemprox/wbemlocator.c | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index 5d659b1..7f8a7a2 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -108,6 +108,9 @@ static void test_IWbemLocator(void) static const WCHAR path19W[] = {'R','O','O','T','\\','\\','C','I','M','V','2',0}; static const WCHAR path20W[] = {'R','O','O','T','\\','C','I','M','V','2','\\',0}; static const WCHAR path21W[] = {'R','O','O','T','/','C','I','M','V','2',0}; + static const WCHAR path22W[] = {'r','o','o','t','\\','d','e','f','a','u','l','t',0}; + static const WCHAR path23W[] = {'r','o','o','t','\\','c','i','m','v','0',0}; + static const WCHAR path24W[] = {'r','o','o','t','\\','c','i','m','v','1',0}; static const struct { const WCHAR *path; @@ -138,7 +141,10 @@ static void test_IWbemLocator(void) { path18W, S_OK }, { path19W, WBEM_E_INVALID_NAMESPACE }, { path20W, WBEM_E_INVALID_NAMESPACE }, - { path21W, S_OK } + { path21W, S_OK }, + { path22W, S_OK }, + { path23W, WBEM_E_INVALID_NAMESPACE }, + { path24W, WBEM_E_INVALID_NAMESPACE } }; IWbemLocator *locator; IWbemServices *services; diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c index e869a6a..07bd89f 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -101,6 +101,7 @@ static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **na { static const WCHAR rootW[] = {'R','O','O','T'}; static const WCHAR cimv2W[] = {'C','I','M','V','2'}; + static const WCHAR defaultW[] = {'D','E','F','A','U','L','T'}; HRESULT hr = WBEM_E_INVALID_NAMESPACE; const WCHAR *p, *q; unsigned int len; @@ -138,7 +139,9 @@ static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **na goto done; } q++; - if ((len = strlenW( q )) != sizeof(cimv2W) / sizeof(cimv2W[0]) || memicmpW( q, cimv2W, len )) + len = strlenW( q ); + if ((len != sizeof(cimv2W) / sizeof(cimv2W[0]) || memicmpW( q, cimv2W, len )) && + (len != sizeof(defaultW) / sizeof(defaultW[0]) || memicmpW( q, defaultW, len ))) goto done; if (!(*namespace = heap_alloc( (len + 1) * sizeof(WCHAR) ))) hr = E_OUTOFMEMORY; else

1 0

Jacek Caban : ieframe/tests: Use winehq snapshot instead of the main page.
by Alexandre Julliard Aug. 21, 2013

Aug. 21, 2013

Module: wine Branch: master Commit: 00bbc620101a2048f3a438ef7838948d8ff89eaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=00bbc620101a2048f3a438ef7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 21 13:45:31 2013 +0200 ieframe/tests: Use winehq snapshot instead of the main page. --- dlls/ieframe/tests/webbrowser.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 217ff28..675bc12 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2742,7 +2742,7 @@ static void test_download(DWORD flags) test_ready_state((flags & (DWL_FROM_PUT_HREF|DWL_FROM_GOBACK|DWL_FROM_GOFORWARD|DWL_REFRESH)) ? READYSTATE_COMPLETE : READYSTATE_LOADING); - if((is_http && !(flags & (DWL_FROM_GOBACK|DWL_FROM_GOFORWARD|DWL_REFRESH))) || (flags & DWL_EXPECT_BEFORE_NAVIGATE)) + if(flags & (DWL_EXPECT_BEFORE_NAVIGATE|(is_http ? DWL_FROM_PUT_HREF : 0))) SET_EXPECT(Invoke_PROPERTYCHANGE); if(flags & DWL_EXPECT_BEFORE_NAVIGATE) { @@ -2784,7 +2784,7 @@ static void test_download(DWORD flags) DispatchMessage(&msg); } - if((is_http && !(flags & (DWL_FROM_GOBACK|DWL_FROM_GOFORWARD|DWL_REFRESH))) || (flags & DWL_EXPECT_BEFORE_NAVIGATE)) + if(flags & (DWL_EXPECT_BEFORE_NAVIGATE|(is_http ? DWL_FROM_PUT_HREF : 0))) todo_wine CHECK_CALLED(Invoke_PROPERTYCHANGE); if(flags & DWL_EXPECT_BEFORE_NAVIGATE) { @@ -2914,6 +2914,8 @@ static void test_put_href(IWebBrowser2 *unk, const char *url) BSTR str; HRESULT hres; + trace("put_href(%s)...\n", url); + doc = get_document(unk); location = NULL; @@ -2922,6 +2924,8 @@ static void test_put_href(IWebBrowser2 *unk, const char *url) ok(hres == S_OK, "get_location failed: %08x\n", hres); ok(location != NULL, "location == NULL\n"); + is_http = !memcmp(url, "http:", 5); + SET_EXPECT(TranslateUrl); SET_EXPECT(Invoke_BEFORENAVIGATE2); if(!is_http) @@ -2929,7 +2933,6 @@ static void test_put_href(IWebBrowser2 *unk, const char *url) dwl_flags = DWL_FROM_PUT_HREF; - is_http = !memcmp(url, "http:", 5); str = a2bstr(current_url = url); is_first_load = FALSE; hres = IHTMLLocation_put_href(location, str); @@ -3423,7 +3426,7 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) test_Refresh(webbrowser); trace("put_href http URL...\n"); - test_put_href(webbrowser, "http://www.winehq.org/"); + test_put_href(webbrowser, "http://test.winehq.org/tests/winehq_snapshot/"); test_download(DWL_FROM_PUT_HREF|DWL_HTTP); trace("GoBack...\n"); @@ -3431,7 +3434,7 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) test_download(DWL_FROM_GOBACK|DWL_HTTP); trace("GoForward...\n"); - test_go_forward(webbrowser, "http://www.winehq.org/"); + test_go_forward(webbrowser, "http://test.winehq.org/tests/winehq_snapshot/"); test_download(DWL_FROM_GOFORWARD|DWL_HTTP); }

1 0

Nikolay Sivov : msxml3: Fix a warning in DTD dumping code on recent libxml2 versions.
by Alexandre Julliard Aug. 21, 2013

Aug. 21, 2013

Module: wine Branch: master Commit: 9554dfb13c9ecdad0c63f74d141f2ae48b2a9130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9554dfb13c9ecdad0c63f74d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 21 14:31:28 2013 +0400 msxml3: Fix a warning in DTD dumping code on recent libxml2 versions. --- dlls/msxml3/node.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 79de75c..a196f4e 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -896,6 +896,50 @@ HRESULT node_get_xml(xmlnode *This, BOOL ensure_eol, BSTR *ret) return *ret ? S_OK : E_OUTOFMEMORY; } +/* duplicates xmlBufferWriteQuotedString() logic */ +static void xml_write_quotedstring(xmlOutputBufferPtr buf, const xmlChar *string) +{ + const xmlChar *cur, *base; + + if (xmlStrchr(string, '\"')) + { + if (xmlStrchr(string, '\'')) + { + xmlOutputBufferWrite(buf, 1, "\""); + base = cur = string; + + while (*cur) + { + if (*cur == '"') + { + if (base != cur) + xmlOutputBufferWrite(buf, cur-base, (const char*)base); + xmlOutputBufferWrite(buf, 6, """); + cur++; + base = cur; + } + else + cur++; + } + if (base != cur) + xmlOutputBufferWrite(buf, cur-base, (const char*)base); + xmlOutputBufferWrite(buf, 1, "\""); + } + else + { + xmlOutputBufferWrite(buf, 1, "\'"); + xmlOutputBufferWriteString(buf, (const char*)string); + xmlOutputBufferWrite(buf, 1, "\'"); + } + } + else + { + xmlOutputBufferWrite(buf, 1, "\""); + xmlOutputBufferWriteString(buf, (const char*)string); + xmlOutputBufferWrite(buf, 1, "\""); + } +} + static void htmldtd_dumpcontent(xmlOutputBufferPtr buf, xmlDocPtr doc) { xmlDtdPtr cur = doc->intSubset; @@ -905,17 +949,17 @@ static void htmldtd_dumpcontent(xmlOutputBufferPtr buf, xmlDocPtr doc) if (cur->ExternalID) { xmlOutputBufferWriteString(buf, " PUBLIC "); - xmlBufferWriteQuotedString(buf->buffer, cur->ExternalID); + xml_write_quotedstring(buf, cur->ExternalID); if (cur->SystemID) { xmlOutputBufferWriteString(buf, " "); - xmlBufferWriteQuotedString(buf->buffer, cur->SystemID); + xml_write_quotedstring(buf, cur->SystemID); } } else if (cur->SystemID) { xmlOutputBufferWriteString(buf, " SYSTEM "); - xmlBufferWriteQuotedString(buf->buffer, cur->SystemID); + xml_write_quotedstring(buf, cur->SystemID); } xmlOutputBufferWriteString(buf, ">\n"); }

1 0

Alexandre Julliard : server: Create the critical section keyed event object on startup.
by Alexandre Julliard Aug. 21, 2013

Aug. 21, 2013

Module: wine Branch: master Commit: 8c0796c4a7ffa758c70df0fe4931339599d6d2dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c0796c4a7ffa758c70df0fe4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 21 12:51:31 2013 +0200 server: Create the critical section keyed event object on startup. --- server/directory.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/server/directory.c b/server/directory.c index 6250177..e5e82b0 100644 --- a/server/directory.c +++ b/server/directory.c @@ -413,6 +413,7 @@ void init_directories(void) static const WCHAR event_high_memW[] = {'H','i','g','h','M','e','m','o','r','y','C','o','n','d','i','t','i','o','n'}; static const WCHAR event_high_pagedW[] = {'H','i','g','h','P','a','g','e','d','P','o','o','l','C','o','n','d','i','t','i','o','n'}; static const WCHAR event_high_nonpgW[] = {'H','i','g','h','N','o','n','P','a','g','e','d','P','o','o','l','C','o','n','d','i','t','i','o','n'}; + static const WCHAR keyed_event_crit_sectW[] = {'C','r','i','t','S','e','c','O','u','t','O','f','M','e','m','o','r','y','E','v','e','n','t'}; static const struct unicode_str kernel_events[] = { { event_low_memW, sizeof(event_low_memW) }, @@ -422,9 +423,11 @@ void init_directories(void) { event_high_pagedW, sizeof(event_high_pagedW) }, { event_high_nonpgW, sizeof(event_high_nonpgW) } }; + static const struct unicode_str keyed_event_crit_sect_str = {keyed_event_crit_sectW, sizeof(keyed_event_crit_sectW)}; struct directory *dir_driver, *dir_device, *dir_global, *dir_basenamed, *dir_sessions, *dir_kernel; struct symlink *link_dosdev, *link_global1, *link_global2, *link_local, *link_pipe, *link_mailslot, *link_0, *link_session; + struct keyed_event *keyed_event; unsigned int i; root_directory = create_directory( NULL, NULL, 0, HASH_SIZE ); @@ -469,6 +472,8 @@ void init_directories(void) struct event *event = create_event( dir_kernel, &kernel_events[i], 0, 1, 0, NULL ); make_object_static( (struct object *)event ); } + keyed_event = create_keyed_event( dir_kernel, &keyed_event_crit_sect_str, 0, NULL ); + make_object_static( (struct object *)keyed_event ); /* the objects hold references so we can release these directories */ release_object( dir_global );

1 0