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

Mikołaj Zalewski : comctl32: header: Automatically set some format fields.
by Alexandre Julliard May 16, 2006

May 16, 2006

Module: wine Branch: refs/heads/master Commit: 3eccdfcca7f25fa9a028b35b8a36adca836c41f5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3eccdfcca7f25fa9a028b35… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue May 16 00:03:14 2006 +0200 comctl32: header: Automatically set some format fields. --- dlls/comctl32/header.c | 11 +++++++ dlls/comctl32/tests/header.c | 65 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index fea902b..b91524e 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -1156,8 +1156,19 @@ HEADER_InsertItemT (HWND hwnd, INT nItem ZeroMemory(lpItem, sizeof(HEADER_ITEM)); HEADER_StoreHDItemInHeader(lpItem, phdi, bUnicode); + /* set automatically some format bits */ if (phdi->mask & HDI_TEXT) lpItem->fmt |= HDF_STRING; + else + lpItem->fmt &= ~HDF_STRING; + + if (lpItem->hbm != NULL) + lpItem->fmt |= HDF_BITMAP; + else + lpItem->fmt &= ~HDF_BITMAP; + + if (phdi->mask & HDI_IMAGE) + lpItem->fmt |= HDF_IMAGE; lpItem->iOrder = iOrder; diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index f85b92c..7e0fda7 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -130,6 +130,15 @@ static LONG getItem(HWND hdex, int idx, return (LONG)SendMessage(hdex, HDM_GETITEMA, (WPARAM)idx, (LPARAM)&hdItem); } +static void addReadDelItem(HWND hdex, HDITEMA *phdiCreate, int maskRead, HDITEMA *phdiRead) +{ + ok(SendMessage(hdex, HDM_INSERTITEMA, (WPARAM)0, (LPARAM)phdiCreate)!=-1, "Adding item failed\n"); + ZeroMemory(phdiRead, sizeof(HDITEMA)); + phdiRead->mask = maskRead; + ok(SendMessage(hdex, HDM_GETITEMA, (WPARAM)0, (LPARAM)phdiRead)!=0, "Getting item data failed\n"); + ok(SendMessage(hdex, HDM_DELETEITEM, (WPARAM)0, (LPARAM)0)!=0, "Deleteing item failed\n"); +} + static HWND create_header_control (void) { HWND handle; @@ -207,6 +216,59 @@ #define TEST_GET_ITEMCOUNT(i)\ ok(res == i, "Got Item Count as %ld\n", res);\ } +static void check_auto_format(void) +{ + HDITEMA hdiCreate; + HDITEMA hdiRead; + ZeroMemory(&hdiCreate, sizeof(HDITEMA)); + + /* Windows implicitly sets some format bits in INSERTITEM */ + + /* HDF_STRING is automaticaly set and cleared for no text */ + hdiCreate.mask = HDI_TEXT|HDI_WIDTH|HDI_FORMAT; + hdiCreate.pszText = "Test"; + hdiCreate.cxy = 100; + hdiCreate.fmt=HDF_CENTER; + addReadDelItem(hWndHeader, &hdiCreate, HDI_FORMAT, &hdiRead); + ok(hdiRead.fmt == (HDF_STRING|HDF_CENTER), "HDF_STRING not set automatically (fmt=%x)\n", hdiRead.fmt); + + hdiCreate.mask = HDI_WIDTH|HDI_FORMAT; + hdiCreate.pszText = "Test"; + hdiCreate.fmt = HDF_CENTER|HDF_STRING; + addReadDelItem(hWndHeader, &hdiCreate, HDI_FORMAT, &hdiRead); + ok(hdiRead.fmt == (HDF_CENTER), "HDF_STRING should be automatically cleared (fmt=%x)\n", hdiRead.fmt); + + /* HDF_BITMAP is automatically set and cleared for a NULL bitmap or no bitmap */ + hdiCreate.mask = HDI_BITMAP|HDI_WIDTH|HDI_FORMAT; + hdiCreate.hbm = CreateBitmap(16, 16, 1, 8, NULL); + hdiCreate.fmt = HDF_CENTER; + addReadDelItem(hWndHeader, &hdiCreate, HDI_FORMAT, &hdiRead); + ok(hdiRead.fmt == (HDF_BITMAP|HDF_CENTER), "HDF_BITMAP not set automatically (fmt=%x)\n", hdiRead.fmt); + DeleteObject(hdiCreate.hbm); + + hdiCreate.hbm = NULL; + hdiCreate.fmt = HDF_CENTER|HDF_BITMAP; + addReadDelItem(hWndHeader, &hdiCreate, HDI_FORMAT, &hdiRead); + ok(hdiRead.fmt == HDF_CENTER, "HDF_BITMAP not cleared automatically for NULL bitmap (fmt=%x)\n", hdiRead.fmt); + + hdiCreate.mask = HDI_WIDTH|HDI_FORMAT; + hdiCreate.fmt = HDF_CENTER|HDF_BITMAP; + addReadDelItem(hWndHeader, &hdiCreate, HDI_FORMAT, &hdiRead); + ok(hdiRead.fmt == HDF_CENTER, "HDF_BITMAP not cleared automatically for no bitmap (fmt=%x)\n", hdiRead.fmt); + + /* HDF_IMAGE is automatically set but not cleared */ + hdiCreate.mask = HDI_IMAGE|HDI_WIDTH|HDI_FORMAT; + hdiCreate.iImage = 17; + addReadDelItem(hWndHeader, &hdiCreate, HDI_FORMAT, &hdiRead); + ok(hdiRead.fmt == (HDF_IMAGE|HDF_CENTER), "HDF_IMAGE not set automatically (fmt=%x)\n", hdiRead.fmt); + + hdiCreate.mask = HDI_WIDTH|HDI_FORMAT; + hdiCreate.fmt = HDF_CENTER|HDF_IMAGE; + hdiCreate.iImage = 0; + addReadDelItem(hWndHeader, &hdiCreate, HDI_FORMAT, &hdiRead); + ok(hdiRead.fmt == (HDF_CENTER|HDF_IMAGE), "HDF_IMAGE shouldn't be cleared automatically (fmt=%x)\n", hdiRead.fmt); +} + static void test_header_control (void) { LONG res; @@ -278,6 +340,9 @@ static void test_header_control (void) /* unexpected notifies cleared by notifies_received in setItem */ delItem(hWndHeader, 0); + check_auto_format(); + TEST_GET_ITEMCOUNT(6); + res = delItem(hWndHeader, 5); ok(res == 1, "Deleting Out of Range item should fail with 1 (%ld)\n", res); res = delItem(hWndHeader, -2);

1 0

Peter Beutner : msvcrt: Fix handling of 'h' prefix in swprintf.
by Alexandre Julliard May 16, 2006

May 16, 2006

Module: wine Branch: refs/heads/master Commit: bc83ae9fda6bf4a381e881523c3be3dfb3a688b2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bc83ae9fda6bf4a381e8815… Author: Peter Beutner <p.beutner(a)gmx.net> Date: Tue May 16 18:18:51 2006 +0200 msvcrt: Fix handling of 'h' prefix in swprintf. - '%hs' in widechar string functions is wrongly recognized as a widechar string. Fix this by always checking the prefix first. - add testcase - remove code duplication in %c/%s handling by moving code into a function. --- dlls/msvcrt/tests/printf.c | 7 ++++ dlls/msvcrt/wcs.c | 69 ++++++++++++++++++-------------------------- 2 files changed, 34 insertions(+), 42 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 64b5d5a..ff0058d 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -469,8 +469,11 @@ static void test_swprintf( void ) double pnumber=789456123; const wchar_t TwentyThreePoint15e[]= {'%','+','#','2','3','.','1','5','e',0}; const wchar_t e008[] = {'e','+','0','0','8',0}; - const char string[]={'s','t','r','i','n','g',0}; + const wchar_t string_w[] = {'s','t','r','i','n','g',0}; + const char string[] = "string"; const wchar_t S[]={'%','S',0}; + const wchar_t hs[] = {'%', 'h', 's', 0}; + swprintf(buffer,TwentyThreePoint15e,pnumber); todo_wine { @@ -480,6 +483,8 @@ static void test_swprintf( void ) ok(wcslen(buffer) == 11,"Problem with long long\n"); swprintf(buffer,S,string); ok(wcslen(buffer) == 6,"Problem with \"%%S\" interpretation\n"); + swprintf(buffer, hs, string); + ok( wcscmp(string_w,buffer) == 0, "swprintf failed with %%hs\n"); } static void test_fwprintf( void ) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 9c35c46..095bef7 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -357,6 +357,26 @@ static inline int pf_output_format_A( pf return r; } +static int pf_handle_string_format( pf_output *out, const void* str, int len, + pf_flags *flags, BOOL capital_letter) +{ + if(str == NULL) /* catch NULL pointer */ + return pf_output_format_A( out, "(null)", -1, flags); + + /* prefixes take priority over %c,%s vs. %C,%S, so we handle them first */ + if(flags->WideString || flags->IntegerLength == 'l') + return pf_output_format_W( out, str, len, flags); + if(flags->IntegerLength == 'h') + return pf_output_format_A( out, str, len, flags); + + /* %s,%c -> chars in ansi functions & wchars in unicode + * %S,%C -> wchars in ansi functions & chars in unicode */ + if( capital_letter == out->unicode) /* either both TRUE or both FALSE */ + return pf_output_format_A( out, str, len, flags); + else + return pf_output_format_W( out, str, len, flags); +} + static inline BOOL pf_is_integer_format( char fmt ) { static const char float_fmts[] = "diouxX"; @@ -602,50 +622,17 @@ static int pf_vsnprintf( pf_output *out, flags.Format = *p; r = 0; - /* output a unicode string */ - if( ( flags.Format == 's' && (flags.WideString || flags.IntegerLength == 'l' )) || - ( !out->unicode && flags.Format == 'S' ) || - ( out->unicode && flags.Format == 's' ) ) - { - LPCWSTR str = va_arg( valist, const WCHAR * ); - - if( str ) - r = pf_output_format_W( out, str, -1, &flags ); - else - r = pf_output_format_A( out, "(null)", -1, &flags ); - } - - /* output a ASCII string */ - else if( ( flags.Format == 's' && flags.IntegerLength == 'h' ) || - ( out->unicode && flags.Format == 'S' ) || - ( !out->unicode && flags.Format == 's' ) ) - { - LPCSTR str = va_arg( valist, const CHAR * ); - - if( str ) - r = pf_output_format_A( out, str, -1, &flags ); - else - r = pf_output_format_A( out, "(null)", -1, &flags ); - } - - /* output a single wide character */ - else if( ( flags.Format == 'c' && flags.IntegerLength == 'w' ) || - ( out->unicode && flags.Format == 'c' ) || - ( !out->unicode && flags.Format == 'C' ) ) - { - WCHAR ch = va_arg( valist, int ); - - r = pf_output_format_W( out, &ch, 1, &flags ); - } + /* output a string */ + if( flags.Format == 's' || flags.Format == 'S' ) + r = pf_handle_string_format( out, va_arg(valist, const void*), -1, + &flags, (flags.Format == 'S') ); - /* output a single ascii character */ - else if( ( flags.Format == 'c' && flags.IntegerLength == 'h' ) || - ( out->unicode && flags.Format == 'C' ) || - ( !out->unicode && flags.Format == 'c' ) ) + /* output a single character */ + else if( flags.Format == 'c' || flags.Format == 'C' ) { - CHAR ch = va_arg( valist, int ); + INT ch = va_arg( valist, int ); - r = pf_output_format_A( out, &ch, 1, &flags ); + r = pf_handle_string_format( out, &ch, 1, &flags, (flags.Format == 'C') ); } /* output a pointer */

1 0

Mike McCormack : wininet: Add a standalone http test.
by Alexandre Julliard May 16, 2006

May 16, 2006

Module: wine Branch: refs/heads/master Commit: 854808d9d465bc154863e2dc890f7b9c5d6dc919 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=854808d9d465bc154863e2d… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue May 16 23:03:45 2006 +0900 wininet: Add a standalone http test. --- dlls/wininet/tests/Makefile.in | 2 - dlls/wininet/tests/http.c | 114 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/Makefile.in b/dlls/wininet/tests/Makefile.in index c479f05..6490d7f 100644 --- a/dlls/wininet/tests/Makefile.in +++ b/dlls/wininet/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = wininet.dll -IMPORTS = wininet kernel32 +IMPORTS = wininet ws2_32 kernel32 CTESTS = \ generated.c \ diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 8af7d6e..b2108c3 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -27,6 +27,7 @@ #include <stdlib.h> #include "windef.h" #include "winbase.h" #include "wininet.h" +#include "winsock.h" #include "wine/test.h" @@ -802,6 +803,118 @@ static void HttpHeaders_test(void) ok(InternetCloseHandle(hSession), "Close session handle failed\n"); } +static const char okmsg[] = +"HTTP/1.0 200 OK\r\n" +"Server: winetest\r\n" +"\r\n"; + +static const char page1[] = +"<HTML>\r\n" +"<HEAD><TITLE>wininet test page</TITLE></HEAD>\r\n" +"<BODY>The quick brown fox jumped over the lazy dog<P></BODY>\r\n" +"</HTML>\r\n\r\n"; + +struct server_info { + HANDLE hEvent; + int port; +}; + +static DWORD CALLBACK server_thread(LPVOID param) +{ + struct server_info *si = param; + int r, s, c, i; + struct sockaddr_in sa; + char buffer[0x100]; + WSADATA wsaData; + + WSAStartup(MAKEWORD(1,1), &wsaData); + + s = socket(AF_INET, SOCK_STREAM, 0); + if (s<0) + return FALSE; + + memset(&sa, 0, sizeof sa); + sa.sin_family = AF_INET; + sa.sin_port = htons(si->port); + sa.sin_addr.S_un.S_addr = inet_addr("127.0.0.1"); + + r = bind(s, (struct sockaddr*) &sa, sizeof sa); + if (r<0) + return 1; + + listen(s, 1); + + SetEvent(si->hEvent); + + c = accept(s, NULL, NULL); + + memset(buffer, 0, sizeof buffer); + for(i=0; i<(sizeof buffer-1); i++) + { + r = recv(c, &buffer[i], 1, 0); + if (r != 1) + break; + if (i<4) continue; + if (buffer[i-2] == '\n' && buffer[i] == '\n' && + buffer[i-3] == '\r' && buffer[i-1] == '\r') + break; + } + + send(c, okmsg, sizeof okmsg-1, 0); + send(c, page1, sizeof page1-1, 0); + + closesocket(c); + closesocket(s); + + return 0; +} + +static void test_http_connection(void) +{ + struct server_info si; + HINTERNET hi, hc, hr; + HANDLE hThread; + DWORD id = 0, r, count; + char buffer[0x100]; + + si.hEvent = CreateEvent(NULL, 0, 0, NULL); + si.port = 7531; + + hThread = CreateThread(NULL, 0, server_thread, (LPVOID) &si, 0, &id); + ok( hThread != NULL, "create thread failed\n"); + + r = WaitForSingleObject(si.hEvent, 3000); + ok (r == WAIT_OBJECT_0, "failed to start wininet test server\n"); + if (r != WAIT_OBJECT_0) + return; + + hi = InternetOpen(NULL, 0, NULL, NULL, 0); + ok(hi != NULL, "open failed\n"); + + hc = InternetConnect(hi, "localhost", si.port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(hc != NULL, "connect failed\n"); + + hr = HttpOpenRequest(hc, NULL, "/test", NULL, NULL, NULL, 0, 0); + ok(hr != NULL, "HttpOpenRequest failed\n"); + + r = HttpSendRequest(hr, NULL, 0, NULL, 0); + ok(r, "HttpSendRequest failed\n"); + + count = 0; + memset(buffer, 0, sizeof buffer); + r = InternetReadFile(hr, buffer, sizeof buffer, &count); + ok(r, "InternetReadFile failed\n"); + ok(count == sizeof page1 - 1, "count was wrong\n"); + ok(!memcmp(buffer, page1, sizeof page1), "http data wrong\n"); + + InternetCloseHandle(hr); + InternetCloseHandle(hc); + InternetCloseHandle(hi); + + r = WaitForSingleObject(hThread, 3000); + ok( r == WAIT_OBJECT_0, "thread wait failed\n"); + CloseHandle(hThread); +} START_TEST(http) { @@ -815,4 +928,5 @@ START_TEST(http) InternetTimeToSystemTimeW_test(); HttpSendRequestEx_test(); HttpHeaders_test(); + test_http_connection(); }

1 0

Mike McCormack : wininet: Make sure hIC is valid before trying to use it. ( Coverity)
by Alexandre Julliard May 16, 2006

May 16, 2006

Module: wine Branch: refs/heads/master Commit: 8dcb4479f3e278a407501ad027040a9976217de4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8dcb4479f3e278a407501ad… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue May 16 18:53:00 2006 +0900 wininet: Make sure hIC is valid before trying to use it. (Coverity) --- dlls/wininet/ftp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 5fde83d..c19cef9 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -252,6 +252,7 @@ BOOL WINAPI FTP_FtpPutFileW(LPWININETFTP /* Clear any error information */ INTERNET_SetLastError(0); + hIC = (LPWININETAPPINFOW) lpwfs->hdr.lpwhparent; /* Open file to be uploaded */ if (INVALID_HANDLE_VALUE == @@ -261,7 +262,6 @@ BOOL WINAPI FTP_FtpPutFileW(LPWININETFTP goto lend; } - hIC = (LPWININETAPPINFOW) lpwfs->hdr.lpwhparent; SendAsyncCallback(&lpwfs->hdr, lpwfs->hdr.dwContext, INTERNET_STATUS_SENDING_REQUEST, NULL, 0); if (FTP_SendStore(lpwfs, lpszNewRemoteFile, dwFlags))

1 0

Vitaliy Margolen : d3d: Add D3DDEVTYPE_NULLREF definition.
by Alexandre Julliard May 16, 2006

May 16, 2006

Module: wine Branch: refs/heads/master Commit: f9fc4b86c0be0322d9f2674fc3f3a86ac8d6c65c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f9fc4b86c0be0322d9f2674… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Tue May 16 07:30:15 2006 -0600 d3d: Add D3DDEVTYPE_NULLREF definition. --- include/d3d9types.h | 1 + include/wine/wined3d_types.h | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/d3d9types.h b/include/d3d9types.h index 3c4b8a1..fc8b40d 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -740,6 +740,7 @@ typedef enum _D3DDEVTYPE { D3DDEVTYPE_HAL = 1, D3DDEVTYPE_REF = 2, D3DDEVTYPE_SW = 3, + D3DDEVTYPE_NULLREF = 4, D3DDEVTYPE_FORCE_DWORD = 0xffffffff } D3DDEVTYPE; diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index b32ec37..9d6a6c4 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -116,6 +116,7 @@ typedef enum _WINED3DDEVTYPE { WINED3DDEVTYPE_HAL = 1, WINED3DDEVTYPE_REF = 2, WINED3DDEVTYPE_SW = 3, + WINED3DDEVTYPE_NULLREF = 4, WINED3DDEVTYPE_FORCE_DWORD = 0xffffffff } WINED3DDEVTYPE;

1 0

Hans Leidekker : wldap32: Document the modify and modrdn functions.
by Alexandre Julliard May 16, 2006

May 16, 2006

Module: wine Branch: refs/heads/master Commit: c0364ef571cd650e5c830c1b7476420d8bb31a81 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c0364ef571cd650e5c830c1… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue May 16 14:37:17 2006 +0200 wldap32: Document the modify and modrdn functions. --- dlls/wldap32/modify.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wldap32/modrdn.c | 88 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 187 insertions(+), 0 deletions(-) diff --git a/dlls/wldap32/modify.c b/dlls/wldap32/modify.c index 55ac776..52f263b 100644 --- a/dlls/wldap32/modify.c +++ b/dlls/wldap32/modify.c @@ -41,6 +41,11 @@ #include "wldap32.h" WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +/*********************************************************************** + * ldap_modifyA (WLDAP32.@) + * + * See ldap_modifyW. + */ ULONG ldap_modifyA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *mods[] ) { ULONG ret = LDAP_NOT_SUPPORTED; @@ -73,6 +78,26 @@ #endif return ret; } +/*********************************************************************** + * ldap_modifyW (WLDAP32.@) + * + * Change an entry in a directory tree (asynchronous operation). + * + * PARAMS + * ld [I] Pointer to an LDAP context. + * dn [I] DN of the entry to change. + * mods [I] Pointer to an array of LDAPModW structures, each + * specifying an attribute and its values to change. + * + * RETURNS + * Success: Message ID of the modify operation. + * Failure: An LDAP error code. + * + * NOTES + * Call ldap_result with the message ID to get the result of + * the operation. Cancel the operation by calling ldap_abandon + * with the message ID. + */ ULONG ldap_modifyW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *mods[] ) { ULONG ret = LDAP_NOT_SUPPORTED; @@ -112,6 +137,11 @@ #endif return ret; } +/*********************************************************************** + * ldap_modify_extA (WLDAP32.@) + * + * See ldap_modify_extW. + */ ULONG ldap_modify_extA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *mods[], PLDAPControlA *serverctrls, PLDAPControlA *clientctrls, ULONG *message ) { @@ -157,6 +187,29 @@ #endif return ret; } +/*********************************************************************** + * ldap_modify_extW (WLDAP32.@) + * + * Change an entry in a directory tree (asynchronous operation). + * + * PARAMS + * ld [I] Pointer to an LDAP context. + * dn [I] DN of the entry to change. + * mods [I] Pointer to an array of LDAPModW structures, each + * specifying an attribute and its values to change. + * serverctrls [I] Array of LDAP server controls. + * clientctrls [I] Array of LDAP client controls. + * message [O] Message ID of the modify operation. + * + * RETURNS + * Success: LDAP_SUCCESS + * Failure: An LDAP error code. + * + * NOTES + * Call ldap_result with the message ID to get the result of + * the operation. The serverctrls and clientctrls parameters are + * optional and should be set to NULL if not used. + */ ULONG ldap_modify_extW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *mods[], PLDAPControlW *serverctrls, PLDAPControlW *clientctrls, ULONG *message ) { @@ -204,6 +257,11 @@ #endif return ret; } +/*********************************************************************** + * ldap_modify_ext_sA (WLDAP32.@) + * + * See ldap_modify_ext_sW. + */ ULONG ldap_modify_ext_sA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *mods[], PLDAPControlA *serverctrls, PLDAPControlA *clientctrls ) { @@ -249,6 +307,27 @@ #endif return ret; } +/*********************************************************************** + * ldap_modify_ext_sW (WLDAP32.@) + * + * Change an entry in a directory tree (synchronous operation). + * + * PARAMS + * ld [I] Pointer to an LDAP context. + * dn [I] DN of the entry to change. + * mods [I] Pointer to an array of LDAPModW structures, each + * specifying an attribute and its values to change. + * serverctrls [I] Array of LDAP server controls. + * clientctrls [I] Array of LDAP client controls. + * + * RETURNS + * Success: LDAP_SUCCESS + * Failure: An LDAP error code. + * + * NOTES + * The serverctrls and clientctrls parameters are optional and + * should be set to NULL if not used. + */ ULONG ldap_modify_ext_sW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *mods[], PLDAPControlW *serverctrls, PLDAPControlW *clientctrls ) { @@ -295,6 +374,11 @@ #endif return ret; } +/*********************************************************************** + * ldap_modify_sA (WLDAP32.@) + * + * See ldap_modify_sW. + */ ULONG ldap_modify_sA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *mods[] ) { ULONG ret = LDAP_NOT_SUPPORTED; @@ -327,6 +411,21 @@ #endif return ret; } +/*********************************************************************** + * ldap_modify_sW (WLDAP32.@) + * + * Change an entry in a directory tree (synchronous operation). + * + * PARAMS + * ld [I] Pointer to an LDAP context. + * dn [I] DN of the entry to change. + * attrs [I] Pointer to an array of LDAPModW structures, each + * specifying an attribute and its values to change. + * + * RETURNS + * Success: LDAP_SUCCESS + * Failure: An LDAP error code. + */ ULONG ldap_modify_sW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *mods[] ) { ULONG ret = LDAP_NOT_SUPPORTED; diff --git a/dlls/wldap32/modrdn.c b/dlls/wldap32/modrdn.c index a572fe7..8e1c12b 100644 --- a/dlls/wldap32/modrdn.c +++ b/dlls/wldap32/modrdn.c @@ -40,6 +40,11 @@ #include "wldap32.h" WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +/*********************************************************************** + * ldap_modrdnA (WLDAP32.@) + * + * See ldap_modrdnW. + */ ULONG ldap_modrdnA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR newdn ) { ULONG ret = LDAP_NOT_SUPPORTED; @@ -70,6 +75,25 @@ #endif return ret; } +/*********************************************************************** + * ldap_modrdnW (WLDAP32.@) + * + * Change the RDN of a directory entry (asynchronous operation). + * + * PARAMS + * ld [I] Pointer to an LDAP context. + * dn [I] DN of the entry to change. + * newdn [I] New DN for the entry. + * + * RETURNS + * Success: Message ID of the modrdn operation. + * Failure: An LDAP error code. + * + * NOTES + * Call ldap_result with the message ID to get the result of + * the operation. Cancel the operation by calling ldap_abandon + * with the message ID. + */ ULONG ldap_modrdnW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR newdn ) { ULONG ret = LDAP_NOT_SUPPORTED; @@ -106,6 +130,11 @@ #endif return ret; } +/*********************************************************************** + * ldap_modrdn2A (WLDAP32.@) + * + * See ldap_modrdn2W. + */ ULONG ldap_modrdn2A( WLDAP32_LDAP *ld, PCHAR dn, PCHAR newdn, INT delete ) { ULONG ret = LDAP_NOT_SUPPORTED; @@ -136,6 +165,26 @@ #endif return ret; } +/*********************************************************************** + * ldap_modrdn2W (WLDAP32.@) + * + * Change the RDN of a directory entry (asynchronous operation). + * + * PARAMS + * ld [I] Pointer to an LDAP context. + * dn [I] DN of the entry to change. + * newdn [I] New DN for the entry. + * delete [I] Delete old DN? + * + * RETURNS + * Success: Message ID of the modrdn operation. + * Failure: An LDAP error code. + * + * NOTES + * Call ldap_result with the message ID to get the result of + * the operation. Cancel the operation by calling ldap_abandon + * with the message ID. + */ ULONG ldap_modrdn2W( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR newdn, INT delete ) { ULONG ret = LDAP_NOT_SUPPORTED; @@ -172,6 +221,11 @@ #endif return ret; } +/*********************************************************************** + * ldap_modrdn2_sA (WLDAP32.@) + * + * See ldap_modrdn2_sW. + */ ULONG ldap_modrdn2_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR newdn, INT delete ) { ULONG ret = LDAP_NOT_SUPPORTED; @@ -202,6 +256,21 @@ #endif return ret; } +/*********************************************************************** + * ldap_modrdn2_sW (WLDAP32.@) + * + * Change the RDN of a directory entry (synchronous operation). + * + * PARAMS + * ld [I] Pointer to an LDAP context. + * dn [I] DN of the entry to change. + * newdn [I] New DN for the entry. + * delete [I] Delete old DN? + * + * RETURNS + * Success: LDAP_SUCCESS + * Failure: An LDAP error code. + */ ULONG ldap_modrdn2_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR newdn, INT delete ) { ULONG ret = LDAP_NOT_SUPPORTED; @@ -232,6 +301,11 @@ #endif return ret; } +/*********************************************************************** + * ldap_modrdn_sA (WLDAP32.@) + * + * See ldap_modrdn_sW. + */ ULONG ldap_modrdn_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR newdn ) { ULONG ret = LDAP_NOT_SUPPORTED; @@ -262,6 +336,20 @@ #endif return ret; } +/*********************************************************************** + * ldap_modrdn_sW (WLDAP32.@) + * + * Change the RDN of a directory entry (synchronous operation). + * + * PARAMS + * ld [I] Pointer to an LDAP context. + * dn [I] DN of the entry to change. + * newdn [I] New DN for the entry. + * + * RETURNS + * Success: LDAP_SUCCESS + * Failure: An LDAP error code. + */ ULONG ldap_modrdn_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR newdn ) { ULONG ret = LDAP_NOT_SUPPORTED;

1 0

Andrew Ziem : kernel: Properly delete a test file.
by Alexandre Julliard May 16, 2006

May 16, 2006

Module: wine Branch: refs/heads/master Commit: ac73b30f9509af4f70c17918451e20c4224abb0c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac73b30f9509af4f70c1791… Author: Andrew Ziem <ahziem1(a)mailbolt.com> Date: Mon May 15 08:25:46 2006 -0600 kernel: Properly delete a test file. --- dlls/kernel/tests/path.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/tests/path.c b/dlls/kernel/tests/path.c index d6fceb7..1ff36bd 100644 --- a/dlls/kernel/tests/path.c +++ b/dlls/kernel/tests/path.c @@ -337,6 +337,7 @@ static void test_InitPathA(CHAR *newdir, lstrcmpiA(newdir+lstrlenA(tmppath),tmpstr1)==0, "GetTempFileNameA returned '%s' which doesn't match '%s' or '%s'. id=%x\n", newdir,tmpstr,tmpstr1,id); + ok(DeleteFileA(newdir),"Couldn't delete the temporary file we just created\n"); ok((id=GetTempFileNameA(tmppath,NULL,0,newdir)),"GetTempFileNameA failed\n"); sprintf(tmpstr,"%.4x.tmp",id & 0xffff); @@ -345,7 +346,7 @@ static void test_InitPathA(CHAR *newdir, lstrcmpiA(newdir+lstrlenA(tmppath),tmpstr1)==0, "GetTempFileNameA returned '%s' which doesn't match '%s' or '%s'. id=%x\n", newdir,tmpstr,tmpstr1,id); - + ok(DeleteFileA(newdir),"Couldn't delete the temporary file we just created\n"); /* Find first valid drive letter that is neither newdir[0] nor curDrive */ drives = GetLogicalDrives() & ~(1<<(newdir[0]-'A')); @@ -361,6 +362,7 @@ static void test_InitPathA(CHAR *newdir, really understand how they work. More formal tests should be done along with CreateFile tests */ + ok((id=GetTempFileNameA(tmppath,"path",0,newdir)),"GetTempFileNameA failed\n"); ok(CreateDirectoryA(newdir,NULL)==0, "CreateDirectoryA succeeded even though a file of the same name exists\n"); ok(DeleteFileA(newdir),"Couldn't delete the temporary file we just created\n");

1 0

lostwages/templates/en download.template
by WineHQ May 16, 2006

May 16, 2006

ChangeSet ID: 24867 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/05/16 12:14:22 Modified files: templates/en : download.template Log message: Change "Mandrake" to "Mandriva". Patch: http://cvs.winehq.org/patch.py?id=24867 Old revision New revision Changes Path 1.78 1.79 +2 -2 lostwages/templates/en/download.template Index: lostwages/templates/en/download.template diff -u -p lostwages/templates/en/download.template:1.78 lostwages/templates/en/download.template:1.79 --- lostwages/templates/en/download.template:1.78 16 May 2006 17:14:22 -0000 +++ lostwages/templates/en/download.template 16 May 2006 17:14:22 -0000 @@ -2,7 +2,7 @@ <h1><a name="binary"></a>Wine Binary Downloads</h1> -<p>Official WineHQ builds for Linux Red Hat, Mandrake, SUSE, Slackware and FreeBSD, +<p>Official WineHQ builds for Linux Red Hat, Mandriva, SUSE, Slackware and FreeBSD, hosted by <a href="http://sourceforge.net/project/showfiles.php?group_id=6241">SourceForge.net</a>. Updated with each release.</p> @@ -42,7 +42,7 @@ for post-installation instructions.</b>< <td align=center><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=8…"> <img src="{$root}/images/distro/mandrake.png" width="50" height="50" alt="LinuxMandrake" border="0"></a> </td> - <td> <b><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=8…">Mandrake</a></b> + <td> <b><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=8…">Mandriva</a></b> binary .rpms for Mandrakelinux 10.0, 10.1, and Mandriva Linux 2005 Limited Edition</td> <td><a href="mailto:ivanleo(a)gmail.com">Ivan Leo Puoti</a></td> </tr>

1 0

Alexandre Julliard : tools: Updated the autoconf scripts to more recent versions.
by Alexandre Julliard May 16, 2006

May 16, 2006

Module: wine Branch: refs/heads/master Commit: 5c0dde7798d8fde1aa1603f634b3787cd32f88f6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5c0dde7798d8fde1aa1603f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 16 13:21:36 2006 +0200 tools: Updated the autoconf scripts to more recent versions. --- tools/config.guess | 584 ++++++++++++++++++++++++++++------------------------ tools/config.sub | 118 +++++++---- tools/install-sh | 496 +++++++++++++++++++++++++------------------- 3 files changed, 678 insertions(+), 520 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5c0dde7798d8fde1aa1…

1 0

Dmitry Timoshkov : user32: Add more ShowWindow tests.
by Alexandre Julliard May 16, 2006

May 16, 2006

Module: wine Branch: refs/heads/master Commit: 97c111d0d00ba2e4779e7f183ae4d8cfef2fb40e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=97c111d0d00ba2e4779e7f1… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue May 16 19:33:19 2006 +0900 user32: Add more ShowWindow tests. Move ShowWindow tests for children with an invisible parent into a separate test, add more ShowWindow tests. The tests show that an assumption in dlls/x11drv/winpos.c that SetWindowPos should not be called on a child with an invisible parent is not always true. --- dlls/user/tests/msg.c | 266 ++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 230 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=97c111d0d00ba2e4779…

1 0