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

Francois Gouget : gdi32/tests: Fix a signed/unsigned int mismatch.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: 7ba8c0a420a861c975e60bd3789439ee652be3ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ba8c0a420a861c975e60bd37… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 28 01:17:34 2007 +0200 gdi32/tests: Fix a signed/unsigned int mismatch. --- dlls/gdi32/tests/bitmap.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 99f2986..1d2e8e6 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1051,7 +1051,7 @@ static void test_GetDIBits_selected_DIB(UINT bpp) info->bmiHeader.biBitCount = bpp; info->bmiHeader.biCompression = BI_RGB; - for (i=0; i < (1 << bpp); i++) + for (i=0; i < (1u << bpp); i++) { BYTE c = i * (1 << (8 - bpp)); info->bmiColors[i].rgbRed = c; @@ -1085,7 +1085,7 @@ static void test_GetDIBits_selected_DIB(UINT bpp) /* Compare the color table and the bits */ equalContents = TRUE; - for (i=0; i < (1 << bpp); i++) + for (i=0; i < (1u << bpp); i++) { if ((info->bmiColors[i].rgbRed != info2->bmiColors[i].rgbRed) || (info->bmiColors[i].rgbGreen != info2->bmiColors[i].rgbGreen) @@ -1208,7 +1208,7 @@ static void test_GetDIBits_selected_DDB(BOOL monochrome) if (bpp <= 8) { equalContents = TRUE; - for (i=0; i < (1 << bpp); i++) + for (i=0; i < (1u << bpp); i++) { if ((info->bmiColors[i].rgbRed != info2->bmiColors[i].rgbRed) || (info->bmiColors[i].rgbGreen != info2->bmiColors[i].rgbGreen)

1 0

Francois Gouget : ntdll/tests: Remove an inappropriate const qualifier.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: e4a98928abb93757bb9e6250b2061fbe7cec8f0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4a98928abb93757bb9e6250b… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 28 01:13:24 2007 +0200 ntdll/tests: Remove an inappropriate const qualifier. --- dlls/ntdll/tests/exception.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 83613f7..c59a5bb 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -174,7 +174,7 @@ static const struct exception static int got_exception; static BOOL have_vectored_api; -static void run_exception_test(const void *handler, const void* context, +static void run_exception_test(void *handler, const void* context, const void *code, unsigned int code_size) { struct {

1 0

Francois Gouget : setupapi/tests: There is no strncasecmp() on Windows. So use CompareString() instead.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: b6a2102d340d9ed5a7b61dbba8bba962fe2b6e65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6a2102d340d9ed5a7b61dbba… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 28 01:12:12 2007 +0200 setupapi/tests: There is no strncasecmp() on Windows. So use CompareString() instead. --- dlls/setupapi/tests/misc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index 1c193e1..f8750b6 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -25,6 +25,7 @@ #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "winuser.h" #include "winreg.h" #include "setupapi.h" @@ -97,7 +98,7 @@ static BOOL check_format(LPSTR path, LPSTR inf) GetWindowsDirectory(check, MAX_PATH); lstrcat(check, format); - res = !strncasecmp(check, path, lstrlen(check)) && + res = CompareString(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, check, -1, path, lstrlen(check)) == CSTR_EQUAL && path[lstrlen(check)] != '\\'; return (!inf) ? res : res && (inf == path + lstrlen(check) - 3);

1 0

Francois Gouget : rpcrt4/tests: Fix a Visual C++ double to float conversion warning.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: 8d7ad785e3ec5004ae8e22aa7c823de1466e8bb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d7ad785e3ec5004ae8e22aa7… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 28 01:17:17 2007 +0200 rpcrt4/tests: Fix a Visual C++ double to float conversion warning. --- dlls/rpcrt4/tests/ndr_marshall.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index e6bd4d5..ec12983 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -437,7 +437,7 @@ static void test_simple_types(void) *(ULONGLONG*)(wiredata + 2 * sizeof(void*)) = ll; test_pointer_marshal(fmtstr_up_longlong, &ll, 8, wiredata, 16, NULL, 0, "up_longlong"); - f = 3.1415; + f = 3.1415f; *(void**)wiredata = &f; *(float*)(wiredata + sizeof(void*)) = f; test_pointer_marshal(fmtstr_up_float, &f, 4, wiredata, 8, NULL, 0, "up_float");

1 0

Francois Gouget : rpcrt4/tests: Fix signed/unsigned and 32/ 64bit issues with the wiredatalen parameter.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: f27a7153a51d4efb0464f742274bf225924bea2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f27a7153a51d4efb0464f7422… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 28 01:11:20 2007 +0200 rpcrt4/tests: Fix signed/unsigned and 32/64bit issues with the wiredatalen parameter. --- dlls/rpcrt4/tests/ndr_marshall.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 3a9f791..e6bd4d5 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -113,7 +113,7 @@ static void test_pointer_marshal(const unsigned char *formattypes, void *memsrc, long srcsize, const void *wiredata, - long wiredatalen, + ULONG wiredatalen, int(*cmp)(const void*,const void*,size_t), long num_additional_allocs, const char *msgpfx) @@ -152,7 +152,7 @@ static void test_pointer_marshal(const unsigned char *formattypes, ptr = NdrPointerMarshall( &StubMsg, memsrc, formattypes ); ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr); - ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %ld\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); + ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); ok(!memcmp(StubMsg.BufferStart, wiredata, wiredatalen), "%s: incorrectly marshaled\n", msgpfx); StubMsg.Buffer = StubMsg.BufferStart; @@ -163,7 +163,7 @@ static void test_pointer_marshal(const unsigned char *formattypes, /* NdrPointerMemorySize crashes under Wine */ size = NdrPointerMemorySize( &StubMsg, formattypes ); ok(size == StubMsg.MemorySize, "%s: mem size %u size %u\n", msgpfx, StubMsg.MemorySize, size); - ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %ld\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); + ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); if(formattypes[1] & 0x10 /* FC_POINTER_DEREF */) ok(size == srcsize + 4, "%s: mem size %u\n", msgpfx, size); else @@ -173,7 +173,7 @@ static void test_pointer_marshal(const unsigned char *formattypes, StubMsg.MemorySize = 16; size = NdrPointerMemorySize( &StubMsg, formattypes ); ok(size == StubMsg.MemorySize, "%s: mem size %u size %u\n", msgpfx, StubMsg.MemorySize, size); - ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %ld\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); + ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); if(formattypes[1] & 0x10 /* FC_POINTER_DEREF */) ok(size == srcsize + 4 + 16, "%s: mem size %u\n", msgpfx, size); else @@ -183,7 +183,7 @@ static void test_pointer_marshal(const unsigned char *formattypes, StubMsg.MemorySize = 1; size = NdrPointerMemorySize( &StubMsg, formattypes ); ok(size == StubMsg.MemorySize, "%s: mem size %u size %u\n", msgpfx, StubMsg.MemorySize, size); - ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %ld\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); + ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); if(formattypes[1] & 0x10 /* FC_POINTER_DEREF */) ok(size == srcsize + 4 + (srcsize == 8 ? 8 : 4), "%s: mem size %u\n", msgpfx, size); else @@ -203,7 +203,7 @@ static void test_pointer_marshal(const unsigned char *formattypes, ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr); ok(mem == mem_orig, "%s: mem has changed %p %p\n", msgpfx, mem, mem_orig); ok(!cmp(mem, memsrc, srcsize), "%s: incorrectly unmarshaled\n", msgpfx); - ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %ld\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); + ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); ok(StubMsg.MemorySize == 0, "%s: memorysize %d\n", msgpfx, StubMsg.MemorySize); ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); my_alloc_called = 0; @@ -219,7 +219,7 @@ todo_wine { ok(mem == mem_orig, "%s: mem has changed %p %p\n", msgpfx, mem, mem_orig); } ok(!cmp(mem, memsrc, srcsize), "%s: incorrectly unmarshaled\n", msgpfx); - ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %ld\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); + ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); ok(StubMsg.MemorySize == 0, "%s: memorysize %d\n", msgpfx, StubMsg.MemorySize); todo_wine { @@ -235,7 +235,7 @@ todo_wine { ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr); ok(mem != StubMsg.BufferStart + wiredatalen - srcsize, "%s: mem points to buffer %p %p\n", msgpfx, mem, StubMsg.BufferStart); ok(!cmp(mem, memsrc, size), "%s: incorrectly unmarshaled\n", msgpfx); - ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %ld\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); + ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); ok(StubMsg.MemorySize == 0, "%s: memorysize %d\n", msgpfx, StubMsg.MemorySize); ok(my_alloc_called == num_additional_allocs + 1, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); my_alloc_called = 0; @@ -251,7 +251,7 @@ todo_wine { ok(mem == StubMsg.BufferStart + wiredatalen - srcsize, "%s: mem doesn't point to buffer %p %p\n", msgpfx, mem, StubMsg.BufferStart); } ok(!cmp(mem, memsrc, size), "%s: incorrecly unmarshaled\n", msgpfx); - ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %ld\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); + ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); ok(StubMsg.MemorySize == 0, "%s: memorysize %d\n", msgpfx, StubMsg.MemorySize); todo_wine { ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); @@ -454,7 +454,7 @@ static void test_simple_struct_marshal(const unsigned char *formattypes, void *memsrc, long srcsize, const void *wiredata, - long wiredatalen, + ULONG wiredatalen, int(*cmp)(const void*,const void*,size_t), long num_additional_allocs, const char *msgpfx)

1 0

Rob Shearman : wininet: Cope with non-nul-terminated header strings being passed to HttpSendRequestW .
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: 2e21d090cb35f946b8fb2af79256272356b810a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e21d090cb35f946b8fb2af79… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri May 25 12:07:26 2007 +0100 wininet: Cope with non-nul-terminated header strings being passed to HttpSendRequestW. --- dlls/wininet/http.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 056e2fe..c410f92 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2224,8 +2224,8 @@ BOOL WINAPI HttpSendRequestW(HINTERNET hHttpRequest, LPCWSTR lpszHeaders, LPWININETAPPINFOW hIC = NULL; BOOL r; - TRACE("%p, %p (%s), %i, %p, %i)\n", hHttpRequest, - lpszHeaders, debugstr_w(lpszHeaders), dwHeaderLength, lpOptional, dwOptionalLength); + TRACE("%p, %s, %i, %p, %i)\n", hHttpRequest, + debugstr_wn(lpszHeaders, dwHeaderLength), dwHeaderLength, lpOptional, dwOptionalLength); lpwhr = (LPWININETHTTPREQW) WININET_GetObject( hHttpRequest ); if (NULL == lpwhr || lpwhr->hdr.htype != WH_HHTTPREQ) @@ -2260,7 +2260,10 @@ BOOL WINAPI HttpSendRequestW(HINTERNET hHttpRequest, LPCWSTR lpszHeaders, workRequest.hdr = WININET_AddRef( &lpwhr->hdr ); req = &workRequest.u.HttpSendRequestW; if (lpszHeaders) - req->lpszHeader = WININET_strdupW(lpszHeaders); + { + req->lpszHeader = HeapAlloc(GetProcessHeap(), 0, dwHeaderLength * sizeof(WCHAR)); + memcpy(req->lpszHeader, lpszHeaders, dwHeaderLength * sizeof(WCHAR)); + } else req->lpszHeader = 0; req->dwHeaderLength = dwHeaderLength;

1 0

Rob Shearman : wininet: Fix basic authentication by putting Basic directing into the scheme field, as the pszAuthValue can have an optional realm string appended.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: 4d1b8b1a4e169f37878f3bc2874309c617a8b4c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d1b8b1a4e169f37878f3bc28… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri May 25 12:06:11 2007 +0100 wininet: Fix basic authentication by putting Basic directing into the scheme field, as the pszAuthValue can have an optional realm string appended. --- dlls/wininet/http.c | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ad73e41..056e2fe 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -440,12 +440,6 @@ static BOOL HTTP_DoAuthorization( LPWININETHTTPREQW lpwhr, LPCWSTR pszAuthValue if (!pAuthInfo) return FALSE; - pAuthInfo->scheme = WININET_strdupW(pszAuthValue); - if (!pAuthInfo->scheme) - { - HeapFree(GetProcessHeap(), 0, pAuthInfo); - return FALSE; - } SecInvalidateHandle(&pAuthInfo->cred); SecInvalidateHandle(&pAuthInfo->ctx); memset(&pAuthInfo->exp, 0, sizeof(pAuthInfo->exp)); @@ -454,12 +448,29 @@ static BOOL HTTP_DoAuthorization( LPWININETHTTPREQW lpwhr, LPCWSTR pszAuthValue pAuthInfo->auth_data_len = 0; pAuthInfo->finished = FALSE; - if (!is_basic_auth_value(pszAuthValue)) + if (is_basic_auth_value(pszAuthValue)) + { + static const WCHAR szBasic[] = {'B','a','s','i','c',0}; + pAuthInfo->scheme = WININET_strdupW(szBasic); + if (!pAuthInfo->scheme) + { + HeapFree(GetProcessHeap(), 0, pAuthInfo); + return FALSE; + } + } + else { SEC_WINNT_AUTH_IDENTITY_W nt_auth_identity; WCHAR *user = strchrW(domain_and_username, '\\'); WCHAR *domain = domain_and_username; + pAuthInfo->scheme = WININET_strdupW(pszAuthValue); + if (!pAuthInfo->scheme) + { + HeapFree(GetProcessHeap(), 0, pAuthInfo); + return FALSE; + } + if (user) user++; else {

1 0

Francois Gouget : ddraw/tests: Fix compilation with Visual C++ 2005.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: 77440b098f090e36cdd63578c2b45bd45ab87680 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77440b098f090e36cdd63578c… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 27 16:08:39 2007 +0200 ddraw/tests: Fix compilation with Visual C++ 2005. --- dlls/ddraw/tests/d3d.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index bb52816..5de0e2f 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -142,6 +142,8 @@ static void LightTest(void) D3DLIGHT7 light; D3DLIGHT7 defaultlight; BOOL bEnabled = FALSE; + float one = 1.0f; + float zero= 0.0f; /* Set a few lights with funky indices. */ memset(&light, 0, sizeof(light)); @@ -256,7 +258,7 @@ static void LightTest(void) U3(light.dcvDiffuse).b = 1.f; U3(light.dvDirection).z = 1.f; - light.dvAttenuation0 = -1.0 / 0.0; /* -INFINITY */ + light.dvAttenuation0 = -one / zero; /* -INFINITY */ rc = IDirect3DDevice7_SetLight(lpD3DDevice, 103, &light); ok(rc==DDERR_INVALIDPARAMS, "SetLight returned: %x\n", rc); @@ -272,11 +274,11 @@ static void LightTest(void) rc = IDirect3DDevice7_SetLight(lpD3DDevice, 103, &light); ok(rc==D3D_OK, "SetLight returned: %x\n", rc); - light.dvAttenuation0 = 1.0 / 0.0; /* +INFINITY */ + light.dvAttenuation0 = one / zero; /* +INFINITY */ rc = IDirect3DDevice7_SetLight(lpD3DDevice, 103, &light); ok(rc==D3D_OK, "SetLight returned: %x\n", rc); - light.dvAttenuation0 = 0.0 / 0.0; /* NaN */ + light.dvAttenuation0 = zero / zero; /* NaN */ rc = IDirect3DDevice7_SetLight(lpD3DDevice, 103, &light); ok(rc==D3D_OK, "SetLight returned: %x\n", rc);

1 0

Alexandre Julliard : schannel: Use FIELD_OFFSET instead of offsetof.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: e748d62e77c56ccdaa094e0a103d97a059e59b26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e748d62e77c56ccdaa094e0a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 29 13:25:50 2007 +0200 schannel: Use FIELD_OFFSET instead of offsetof. --- dlls/schannel/tests/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index 69f4bd6..af245d8 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -33,9 +33,9 @@ #include "wine/test.h" /* Helper macros to find the size of SECPKG_FUNCTION_TABLE */ -#define SECPKG_FUNCTION_TABLE_SIZE_1 offsetof(SECPKG_FUNCTION_TABLE, \ +#define SECPKG_FUNCTION_TABLE_SIZE_1 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ SetContextAttributes) -#define SECPKG_FUNCTION_TABLE_SIZE_2 offsetof(SECPKG_FUNCTION_TABLE, \ +#define SECPKG_FUNCTION_TABLE_SIZE_2 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ SetCredentialsAttributes) #define SECPKG_FUNCTION_TABLE_SIZE_3 sizeof(SECPKG_FUNCTION_TABLE)

1 0

Francois Gouget : schannel: Fix the name of the SetContextAttributes field of SECPKG_FUNCTION_TABLE.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: 04a3aa99a6b051807ce400f1ae093d31bad2053f URL: http://source.winehq.org/git/wine.git/?a=commit;h=04a3aa99a6b051807ce400f1a… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 27 13:36:48 2007 +0200 schannel: Fix the name of the SetContextAttributes field of SECPKG_FUNCTION_TABLE. --- dlls/schannel/lsamode.c | 4 ++-- dlls/schannel/tests/main.c | 2 +- include/ntsecpkg.h | 6 +++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/schannel/lsamode.c b/dlls/schannel/lsamode.c index b017eb9..23d8599 100644 --- a/dlls/schannel/lsamode.c +++ b/dlls/schannel/lsamode.c @@ -107,7 +107,7 @@ static SECPKG_FUNCTION_TABLE secPkgFunctionTable[2] = NULL, /* SpQueryContextAttributes */ NULL, /* SpAddCredentials */ NULL, /* SetExtendedInformation */ - NULL, /* SpSetContextAttributes */ + NULL, /* SetContextAttributes */ NULL, /* SetCredentialsAttributes */ }, { NULL, /* InitializePackage */ @@ -137,7 +137,7 @@ static SECPKG_FUNCTION_TABLE secPkgFunctionTable[2] = NULL, /* SpQueryContextAttributes */ NULL, /* SpAddCredentials */ NULL, /* SetExtendedInformation */ - NULL, /* SpSetContextAttributes */ + NULL, /* SetContextAttributes */ NULL, /* SetCredentialsAttributes */ } }; diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index 88cafc7..69f4bd6 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -34,7 +34,7 @@ /* Helper macros to find the size of SECPKG_FUNCTION_TABLE */ #define SECPKG_FUNCTION_TABLE_SIZE_1 offsetof(SECPKG_FUNCTION_TABLE, \ - SpSetContextAttributes) + SetContextAttributes) #define SECPKG_FUNCTION_TABLE_SIZE_2 offsetof(SECPKG_FUNCTION_TABLE, \ SetCredentialsAttributes) #define SECPKG_FUNCTION_TABLE_SIZE_3 sizeof(SECPKG_FUNCTION_TABLE) diff --git a/include/ntsecpkg.h b/include/ntsecpkg.h index b8ef222..e887360 100644 --- a/include/ntsecpkg.h +++ b/include/ntsecpkg.h @@ -368,6 +368,10 @@ typedef NTSTATUS (NTAPI SpExportSecurityContextFn)(LSA_SEC_HANDLE, ULONG, typedef NTSTATUS (NTAPI SpImportSecurityContextFn)(PSecBuffer, HANDLE, PLSA_SEC_HANDLE); +#ifdef WINE_NO_UNICODE_MACROS +#undef SetContextAttributes +#endif + /* dispatch tables of LSA-mode functions implemented by SSP/AP */ typedef struct SECPKG_FUNCTION_TABLE { PLSA_AP_INITIALIZE_PACKAGE InitializePackage; @@ -398,7 +402,7 @@ typedef struct SECPKG_FUNCTION_TABLE { SpAddCredentialsFn *SpAddCredentials; SpSetExtendedInformationFn *SetExtendedInformation; /* Packages with version SECPKG_INTERFACE_VERSION end here */ - SpSetContextAttributesFn *SpSetContextAttributes; + SpSetContextAttributesFn *SetContextAttributes; /* Packages with version SECPKG_INTERFACE_VERSION_2 end here */ SpSetCredentialsAttributesFn *SetCredentialsAttributes; /* Packages with version SECPKG_INTERFACE_VERSION_3 end here */

1 0