February 2011 - Wine-Commits

Joris Huizer : rpcrt4: Reduce scope of variable (Clang).
by Alexandre Julliard Feb. 4, 2011

Feb. 4, 2011

Module: wine Branch: master Commit: 3312d63119ac0a05daf89fc44bcc2c54c2d63a4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3312d63119ac0a05daf89fc44… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Fri Feb 4 12:38:45 2011 +0100 rpcrt4: Reduce scope of variable (Clang). --- dlls/rpcrt4/ndr_marshall.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index db8be60..1e99c2e 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -919,7 +919,6 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, } if (pointer_needs_unmarshaling) { - unsigned char *base_ptr_val = *pPointer; unsigned char **current_ptr = pPointer; if (pStubMsg->IsClient) { TRACE("client\n"); @@ -932,7 +931,7 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, if (!fMustAlloc) { if (pSrcPointer) { TRACE("setting *pPointer to %p\n", pSrcPointer); - *pPointer = base_ptr_val = pSrcPointer; + *pPointer = pSrcPointer; } else fMustAlloc = TRUE; } @@ -945,7 +944,6 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, if (attr & RPC_FC_P_DEREF) { fMustAlloc = TRUE; } else { - base_ptr_val = NULL; *current_ptr = NULL; } } @@ -955,7 +953,7 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, if (attr & RPC_FC_P_DEREF) { if (fMustAlloc) { - base_ptr_val = NdrAllocate(pStubMsg, sizeof(void *)); + unsigned char *base_ptr_val = NdrAllocate(pStubMsg, sizeof(void *)); *pPointer = base_ptr_val; current_ptr = (unsigned char **)base_ptr_val; } else

1 0

Austin English : advapi32/tests: Make sure to use return value (LLVM/Clang) .
by Alexandre Julliard Feb. 4, 2011

Feb. 4, 2011

Module: wine Branch: master Commit: d10a4dce8eeae52dd72cfc2d5d66a275e52405e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d10a4dce8eeae52dd72cfc2d5… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 3 18:28:15 2011 -0800 advapi32/tests: Make sure to use return value (LLVM/Clang). --- dlls/advapi32/tests/crypt.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 2ffc62e..865ffa4 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -414,6 +414,7 @@ static void test_verify_sig(void) CRYPT_NEWKEYSET); if (!ret && GetLastError() == NTE_EXISTS) ret = pCryptAcquireContextA(&prov, szKeySet, NULL, PROV_RSA_FULL, 0); + ok(ret, "CryptAcquireContextA failed: %08x\n", GetLastError()); ret = pCryptImportKey(prov, (LPBYTE)privKey, sizeof(privKey), 0, 0, &key); ok(ret, "CryptImportKey failed: %08x\n", GetLastError()); ret = pCryptCreateHash(prov, CALG_MD5, 0, 0, &hash); @@ -898,6 +899,7 @@ static void test_set_provider_ex(void) /* call CryptGetDefaultProvider to see if they match */ result = pCryptGetDefaultProviderA(PROV_RSA_FULL, NULL, CRYPT_MACHINE_DEFAULT, NULL, &cbProvName); + ok(result, "%d\n", GetLastError()); if (!(pszProvName = LocalAlloc(LMEM_ZEROINIT, cbProvName))) goto reset;

1 0

Austin English : wintrust/tests: Make sure return values are used (LLVM/ Clang).
by Alexandre Julliard Feb. 4, 2011

Feb. 4, 2011

Module: wine Branch: master Commit: 4d6caaebbd2a1b086b71928b3d0475b3af9b545a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d6caaebbd2a1b086b71928b3… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 3 17:47:15 2011 -0800 wintrust/tests: Make sure return values are used (LLVM/Clang). --- dlls/wintrust/tests/crypt.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 68a9ebc..bb561a2 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -616,6 +616,7 @@ static void test_CryptCATAdminAddRemoveCatalog(void) /* Set the attributes so we can delete the file */ attrs = FILE_ATTRIBUTE_NORMAL; ret = SetFileAttributesA(tmpfile, attrs); + ok(ret, "SetFileAttributesA failed %u\n", GetLastError()); DeleteFileA(tmpfile); } @@ -784,7 +785,7 @@ static void test_create_catalog_file(void) /* Only enumerate the members */ trace("Only members\n"); - attrcount = membercount = 0; + membercount = 0; catcdf = pCryptCATCDFOpen(cdffileW, NULL); catmember = NULL;

1 0

Huw Davies : rpcrt4/tests: Add a test for marshalling a pointer to a user type, where the user type is itself a pointer.
by Alexandre Julliard Feb. 4, 2011

Feb. 4, 2011

Module: wine Branch: master Commit: 5102d4df8c0c8c7ee7224b32ea9b7b5c80055d02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5102d4df8c0c8c7ee7224b32e… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 4 10:19:18 2011 +0000 rpcrt4/tests: Add a test for marshalling a pointer to a user type, where the user type is itself a pointer. --- dlls/rpcrt4/tests/server.c | 18 +++++++++++++++++- dlls/rpcrt4/tests/server.idl | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index f07fad4..1764718 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -562,6 +562,16 @@ s_hash_bstr(bstr_t b) } void +s_get_a_bstr(bstr_t *b) +{ + bstr_t bstr; + short str[] = {5, 'W', 'i', 'n', 'e', 0}; + bstr = HeapAlloc(GetProcessHeap(), 0, sizeof(str)); + memcpy(bstr, str, sizeof(str)); + *b = bstr + 1; +} + +void s_get_name(name_t *name) { const char bossman[] = "Jeremy White"; @@ -1119,7 +1129,7 @@ pointer_tests(void) puints_t pus; cpuints_t cpus; short bstr_data[] = { 5, 'H', 'e', 'l', 'l', 'o' }; - bstr_t bstr = &bstr_data[1]; + bstr_t bstr = &bstr_data[1], bstr2; name_t name; void *buffer; int *pa2; @@ -1167,6 +1177,12 @@ pointer_tests(void) ok(hash_bstr(bstr) == s_hash_bstr(bstr), "RPC hash_bstr_data\n"); + get_a_bstr(&bstr); + s_get_a_bstr(&bstr2); + ok(!lstrcmpW((LPCWSTR)bstr, (LPCWSTR)bstr2), "bstr mismatch\n"); + HeapFree(GetProcessHeap(), 0, bstr - 1); + HeapFree(GetProcessHeap(), 0, bstr2 - 1); + free_list(list); if (!old_windows_version) diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 89f9930..2605c12 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -311,7 +311,7 @@ cpp_quote("#endif") typedef [unique] user_bstr_t *wire_bstr_t; typedef [wire_marshal(wire_bstr_t)] short *bstr_t; unsigned hash_bstr(bstr_t s); - + void get_a_bstr([out]bstr_t *s); typedef struct { [string, size_is(size)] char *name;

1 0

Austin English : wintrust/tests: Make sure return values are used (LLVM/ Clang).
by Alexandre Julliard Feb. 4, 2011

Feb. 4, 2011

Module: wine Branch: master Commit: 0fed8b0fe2b54add259178186fe2c8954269f398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fed8b0fe2b54add259178186… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 00:46:13 2011 -0800 wintrust/tests: Make sure return values are used (LLVM/Clang). --- dlls/wintrust/tests/register.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/register.c b/dlls/wintrust/tests/register.c index dd266bd..42c5de6 100644 --- a/dlls/wintrust/tests/register.c +++ b/dlls/wintrust/tests/register.c @@ -299,6 +299,7 @@ static void test_RegPolicyFlags(void) ok(ret, "WintrustSetRegPolicyFlags failed: %d\n", GetLastError()); size = sizeof(flags1); r = RegQueryValueExA(key, State, NULL, NULL, (LPBYTE)&flags1, &size); + ok(!r, "RegQueryValueEx failed: %d\n", r); ok(flags1 == flags3, "Got %08x flags instead of %08x\n", flags1, flags3); pWintrustSetRegPolicyFlags(flags2);

1 0

Henri Verbeet : wined3d: Get rid of the IWineD3DQuery typedefs.
by Alexandre Julliard Feb. 4, 2011

Feb. 4, 2011

Module: wine Branch: master Commit: 14c3387fc206f602546cc58091cee8828f859806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14c3387fc206f602546cc5809… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 3 20:14:07 2011 +0100 wined3d: Get rid of the IWineD3DQuery typedefs. --- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/query.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 +--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 61a9e94..e2e4b86 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1236,10 +1236,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface } static HRESULT WINAPI IWineD3DDeviceImpl_CreateQuery(IWineD3DDevice *iface, - WINED3DQUERYTYPE type, IWineD3DQuery **query) + WINED3DQUERYTYPE type, struct wined3d_query **query) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DQueryImpl *object; + struct wined3d_query *object; HRESULT hr; TRACE("iface %p, type %#x, query %p.\n", iface, type, query); @@ -1260,7 +1260,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateQuery(IWineD3DDevice *iface, } TRACE("Created query %p.\n", object); - *query = (IWineD3DQuery *)object; + *query = object; return WINED3D_OK; } diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 9f7b948..368b030 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -370,7 +370,7 @@ static HRESULT wined3d_occlusion_query_ops_get_data(struct wined3d_query *query, return res; } -static HRESULT wined3d_event_query_ops_get_data(IWineD3DQueryImpl *query, +static HRESULT wined3d_event_query_ops_get_data(struct wined3d_query *query, void *pData, DWORD dwSize, DWORD flags) { struct wined3d_event_query *event_query = query->extendedData; @@ -547,7 +547,7 @@ static const struct wined3d_query_ops occlusion_query_ops = wined3d_occlusion_query_ops_issue, }; -HRESULT query_init(IWineD3DQueryImpl *query, IWineD3DDeviceImpl *device, WINED3DQUERYTYPE type) +HRESULT query_init(struct wined3d_query *query, IWineD3DDeviceImpl *device, WINED3DQUERYTYPE type) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1ef4340..a262cca 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -58,8 +58,6 @@ typedef struct IWineD3DSwapChainImpl IWineD3DSwapChainImpl; struct IWineD3DBaseShaderImpl; struct IWineD3DBaseTextureImpl; struct IWineD3DResourceImpl; -typedef struct wined3d_query IWineD3DQueryImpl; -typedef struct wined3d_query IWineD3DQuery; /* Texture format fixups */ @@ -2487,7 +2485,7 @@ struct wined3d_query void *extendedData; }; -HRESULT query_init(IWineD3DQueryImpl *query, IWineD3DDeviceImpl *device, WINED3DQUERYTYPE type) DECLSPEC_HIDDEN; +HRESULT query_init(struct wined3d_query *query, IWineD3DDeviceImpl *device, WINED3DQUERYTYPE type) DECLSPEC_HIDDEN; /* IWineD3DBuffer */

1 0

Henri Verbeet : wined3d: Get rid of the IWineD3DClipper typedefs.
by Alexandre Julliard Feb. 4, 2011

Feb. 4, 2011

Module: wine Branch: master Commit: b59dc811e241264b8800e72dbc333b560a1a1913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b59dc811e241264b8800e72db… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 3 20:14:04 2011 +0100 wined3d: Get rid of the IWineD3DClipper typedefs. --- dlls/wined3d/clipper.c | 11 ++++++----- dlls/wined3d/surface_base.c | 15 +++++++++------ dlls/wined3d/wined3d_private.h | 8 ++++---- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/clipper.c b/dlls/wined3d/clipper.c index 3257296..e5131d7 100644 --- a/dlls/wined3d/clipper.c +++ b/dlls/wined3d/clipper.c @@ -145,17 +145,18 @@ HRESULT CDECL wined3d_clipper_is_clip_list_changed(const struct wined3d_clipper struct wined3d_clipper * CDECL wined3d_clipper_create(void) { - IWineD3DClipperImpl *obj; + struct wined3d_clipper *clipper; TRACE("\n"); - obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*obj)); - if(!obj) + clipper = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*clipper)); + if (!clipper) { ERR("Out of memory when trying to allocate a WineD3D Clipper\n"); return NULL; } - wined3d_clipper_incref(obj); - return (IWineD3DClipper *) obj; + wined3d_clipper_incref(clipper); + + return clipper; } diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index b28e185..65d6327 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -472,21 +472,24 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_UpdateOverlay(IWineD3DSurface *iface, con return WINED3D_OK; } -HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetClipper(IWineD3DSurface *iface, IWineD3DClipper *clipper) +HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetClipper(IWineD3DSurface *iface, struct wined3d_clipper *clipper) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; - TRACE("(%p)->(%p)\n", This, clipper); - This->clipper = (IWineD3DClipperImpl *)clipper; + TRACE("iface %p, clipper %p.\n", iface, clipper); + + This->clipper = clipper; + return WINED3D_OK; } -HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetClipper(IWineD3DSurface *iface, IWineD3DClipper **clipper) +HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetClipper(IWineD3DSurface *iface, struct wined3d_clipper **clipper) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; - TRACE("(%p)->(%p)\n", This, clipper); - *clipper = (IWineD3DClipper *)This->clipper; + TRACE("iface %p, clipper %p.\n", iface, clipper); + + *clipper = This->clipper; if (*clipper) wined3d_clipper_incref(*clipper); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 20da4c7..34fdc3f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -58,8 +58,6 @@ typedef struct IWineD3DSwapChainImpl IWineD3DSwapChainImpl; struct IWineD3DBaseShaderImpl; struct IWineD3DBaseTextureImpl; struct IWineD3DResourceImpl; -typedef struct wined3d_clipper IWineD3DClipperImpl; -typedef struct wined3d_clipper IWineD3DClipper; /* Texture format fixups */ @@ -2208,8 +2206,10 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_UpdateOverlayZOrder(IWineD3DSurface *ifac DWORD flags, IWineD3DSurface *Ref) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_UpdateOverlay(IWineD3DSurface *iface, const RECT *SrcRect, IWineD3DSurface *DstSurface, const RECT *DstRect, DWORD flags, const WINEDDOVERLAYFX *FX) DECLSPEC_HIDDEN; -HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetClipper(IWineD3DSurface *iface, IWineD3DClipper *clipper) DECLSPEC_HIDDEN; -HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetClipper(IWineD3DSurface *iface, IWineD3DClipper **clipper) DECLSPEC_HIDDEN; +HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetClipper(IWineD3DSurface *iface, + struct wined3d_clipper *clipper) DECLSPEC_HIDDEN; +HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetClipper(IWineD3DSurface *iface, + struct wined3d_clipper **clipper) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetFormat(IWineD3DSurface *iface, enum wined3d_format_id format_id) DECLSPEC_HIDDEN; HRESULT IWineD3DBaseSurfaceImpl_CreateDIBSection(IWineD3DSurface *iface) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Use an internal call table for query operations.
by Alexandre Julliard Feb. 4, 2011

Feb. 4, 2011

Module: wine Branch: master Commit: 831a29d250f8e11b6cd9f4404dbff3191cc0dc3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=831a29d250f8e11b6cd9f4404… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 3 20:14:05 2011 +0100 wined3d: Use an internal call table for query operations. --- dlls/wined3d/query.c | 183 ++++++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 12 +++- 2 files changed, 113 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=831a29d250f8e11b6cd9f…

1 0

Austin English : advapi32/tests: Make sure to use return value (LLVM/Clang) .
by Alexandre Julliard Feb. 4, 2011

Feb. 4, 2011

Module: wine Branch: master Commit: 2951007d18b2337874353565e680cbc4d9f8dd65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2951007d18b2337874353565e… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 3 18:28:47 2011 -0800 advapi32/tests: Make sure to use return value (LLVM/Clang). --- dlls/advapi32/tests/crypt_lmhash.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/crypt_lmhash.c b/dlls/advapi32/tests/crypt_lmhash.c index 384221f..a6e812e 100644 --- a/dlls/advapi32/tests/crypt_lmhash.c +++ b/dlls/advapi32/tests/crypt_lmhash.c @@ -211,6 +211,7 @@ static void test_SystemFunction003(void) memset(output, 0, sizeof output); r = pSystemFunction002(data, key, output); + ok(r == STATUS_SUCCESS, "function failed\n"); ok( !memcmp(exp2, output, sizeof output), "decrypted message wrong\n"); } @@ -284,16 +285,19 @@ static void test_SystemFunction004(void) memset(output, 0, sizeof output); r = pSystemFunction002(out.Buffer, key.Buffer, output); + ok(r == STATUS_SUCCESS, "function failed\n"); ok(((unsigned int*)output)[0] == in.Length, "crypted length wrong\n"); ok(((unsigned int*)output)[1] == 1, "crypted value wrong\n"); memset(output, 0, sizeof output); r = pSystemFunction002(out.Buffer+8, key.Buffer, output); + ok(r == STATUS_SUCCESS, "function failed\n"); ok(!memcmp(output, inbuf, sizeof output), "crypted data wrong\n"); memset(output, 0, sizeof output); r = pSystemFunction002(out.Buffer+16, key.Buffer, output); + ok(r == STATUS_SUCCESS, "function failed\n"); ok(!memcmp(output, inbuf, sizeof output), "crypted data wrong\n"); } @@ -496,12 +500,6 @@ static void test_memcmpfunc(memcmpfunc fn) return; } - if (0) - { - /* crashes */ - r = fn(NULL, NULL); - } - memset(arg1, 0, sizeof arg1); memset(arg2, 0, sizeof arg2); arg1[0x10] = 1;

1 0

Jacek Caban : wininet: status_string clean up.
by Alexandre Julliard Feb. 4, 2011

Feb. 4, 2011

Module: wine Branch: master Commit: 680f251220189d325b099049843b2e38d23717ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=680f251220189d325b0990498… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 3 20:46:05 2011 +0100 wininet: status_string clean up. --- dlls/wininet/tests/http.c | 18 +++++++----------- 1 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 5ff3258..a8c843a 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -62,14 +62,14 @@ static BOOL first_connection_to_test_url = TRUE; if (!expect[status] && !optional[status] && wine_allow[status]) \ { \ todo_wine ok(expect[status], "unexpected status %d (%s)\n", status, \ - status < MAX_INTERNET_STATUS && status_string[status][0] != 0 ? \ + status < MAX_INTERNET_STATUS && status_string[status] ? \ status_string[status] : "unknown"); \ wine_allow[status]--; \ } \ else \ { \ ok(expect[status] || optional[status], "unexpected status %d (%s)\n", status, \ - status < MAX_INTERNET_STATUS && status_string[status][0] != 0 ? \ + status < MAX_INTERNET_STATUS && status_string[status] ? \ status_string[status] : "unknown"); \ if (expect[status]) expect[status]--; \ else optional[status]--; \ @@ -86,7 +86,7 @@ static BOOL first_connection_to_test_url = TRUE; do { \ ok(notified[status] + optional[status] == (num), \ "expected status %d (%s) %d times, received %d times\n", \ - status, status < MAX_INTERNET_STATUS && status_string[status][0] != 0 ? \ + status, status < MAX_INTERNET_STATUS && status_string[status] ? \ status_string[status] : "unknown", (num), notified[status]); \ CLEAR_NOTIFIED(status); \ }while(0) @@ -98,10 +98,9 @@ static BOOL first_connection_to_test_url = TRUE; CHECK_NOTIFIED2(status, 0) #define MAX_INTERNET_STATUS (INTERNET_STATUS_COOKIE_HISTORY+1) -#define MAX_STATUS_NAME 50 static int expect[MAX_INTERNET_STATUS], optional[MAX_INTERNET_STATUS], wine_allow[MAX_INTERNET_STATUS], notified[MAX_INTERNET_STATUS]; -static CHAR status_string[MAX_INTERNET_STATUS][MAX_STATUS_NAME]; +static const char *status_string[MAX_INTERNET_STATUS]; static HANDLE hCompleteEvent; @@ -3246,11 +3245,6 @@ static void test_InternetCloseHandle(void) closetest_req, res, GetLastError()); } -#define STATUS_STRING(status) \ - memcpy(status_string[status], #status, sizeof(CHAR) * \ - (strlen(#status) < MAX_STATUS_NAME ? \ - strlen(#status) : \ - MAX_STATUS_NAME - 1)) static void init_status_tests(void) { memset(expect, 0, sizeof(expect)); @@ -3258,6 +3252,8 @@ static void init_status_tests(void) memset(wine_allow, 0, sizeof(wine_allow)); memset(notified, 0, sizeof(notified)); memset(status_string, 0, sizeof(status_string)); + +#define STATUS_STRING(status) status_string[status] = #status STATUS_STRING(INTERNET_STATUS_RESOLVING_NAME); STATUS_STRING(INTERNET_STATUS_NAME_RESOLVED); STATUS_STRING(INTERNET_STATUS_CONNECTING_TO_SERVER); @@ -3284,8 +3280,8 @@ static void init_status_tests(void) STATUS_STRING(INTERNET_STATUS_P3P_HEADER); STATUS_STRING(INTERNET_STATUS_P3P_POLICYREF); STATUS_STRING(INTERNET_STATUS_COOKIE_HISTORY); -} #undef STATUS_STRING +} START_TEST(http) {

1 0