November 2005 - Wine-Commits

wine/dlls/x11drv scroll.c
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21360 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 06:00:31 Modified files: dlls/x11drv : scroll.c Log message: Dmitry Timoshkov <dmitry(a)codeweavers.com> Print scroll and clip rectangles on the ScrollDC entry. Patch: http://cvs.winehq.org/patch.py?id=21360 Old revision New revision Changes Path 1.24 1.25 +3 -2 wine/dlls/x11drv/scroll.c Index: wine/dlls/x11drv/scroll.c diff -u -p wine/dlls/x11drv/scroll.c:1.24 wine/dlls/x11drv/scroll.c:1.25 --- wine/dlls/x11drv/scroll.c:1.24 21 Nov 2005 12: 0:31 -0000 +++ wine/dlls/x11drv/scroll.c 21 Nov 2005 12: 0:31 -0000 @@ -68,8 +68,9 @@ BOOL X11DRV_ScrollDC( HDC hdc, INT dx, I HRGN DstRgn, clipRgn, visrgn; INT code = X11DRV_START_EXPOSURES; - TRACE("dx,dy %d,%d lprcScroll %p lprcClip %p hrgnUpdate %p lprcUpdate %p\n", - dx, dy, lprcScroll, lprcClip, hrgnUpdate, lprcUpdate); + TRACE("dx,dy %d,%d rcScroll %s rcClip %s hrgnUpdate %p lprcUpdate %p\n", + dx, dy, wine_dbgstr_rect(lprcScroll), wine_dbgstr_rect(lprcClip), + hrgnUpdate, lprcUpdate); /* enable X-exposure events */ if (hrgnUpdate || lprcUpdate) ExtEscape( hdc, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, 0, NULL );

1 0

wine/dlls/advapi32 service.c
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21359 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 06:00:16 Modified files: dlls/advapi32 : service.c Log message: Rob Shearman <rob(a)codeweavers.com> Don't try waiting for the service process to start if the CreateProcess call failed. Patch: http://cvs.winehq.org/patch.py?id=21359 Old revision New revision Changes Path 1.96 1.97 +2 -1 wine/dlls/advapi32/service.c Index: wine/dlls/advapi32/service.c diff -u -p wine/dlls/advapi32/service.c:1.96 wine/dlls/advapi32/service.c:1.97 --- wine/dlls/advapi32/service.c:1.96 21 Nov 2005 12: 0:16 -0000 +++ wine/dlls/advapi32/service.c 21 Nov 2005 12: 0:16 -0000 @@ -1535,7 +1535,8 @@ BOOL WINAPI StartServiceW(SC_HANDLE hSer TRACE("returning %d\n", r); - service_wait_for_startup(hService); + if (r) + service_wait_for_startup(hService); return r; }

1 0

wine/dlls/msi registry.c
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21358 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 05:59:54 Modified files: dlls/msi : registry.c Log message: Mike McCormack <mike(a)codeweavers.com> Loop around calling RegQueryValue until we have a big enough string for both the name and the value. Patch: http://cvs.winehq.org/patch.py?id=21358 Old revision New revision Changes Path 1.15 1.16 +46 -29 wine/dlls/msi/registry.c Index: wine/dlls/msi/registry.c diff -u -p wine/dlls/msi/registry.c:1.15 wine/dlls/msi/registry.c:1.16 --- wine/dlls/msi/registry.c:1.15 21 Nov 2005 11:59:54 -0000 +++ wine/dlls/msi/registry.c 21 Nov 2005 11:59:54 -0000 @@ -773,7 +773,7 @@ UINT WINAPI MSI_EnumComponentQualifiers( awstring *lpQualBuf, DWORD* pcchQual, awstring *lpAppBuf, DWORD* pcchAppBuf ) { - DWORD name_sz, val_sz, type, ofs; + DWORD name_sz, val_sz, name_max, val_max, type, ofs; LPWSTR name = NULL, val = NULL; UINT r, r2; HKEY key; @@ -789,40 +789,57 @@ UINT WINAPI MSI_EnumComponentQualifiers( return ERROR_UNKNOWN_COMPONENT; /* figure out how big the name is we want to return */ - name_sz = 0; - if (pcchQual) - { - r = ERROR_OUTOFMEMORY; - name_sz = *pcchQual * 4; - name = msi_alloc( name_sz * sizeof(WCHAR) ); - if (!name) - goto end; - } - - /* figure out how big the value is */ - type = 0; - val_sz = 0; - r = RegEnumValueW( key, iIndex, NULL, NULL, - NULL, &type, NULL, &val_sz ); - if (r != ERROR_SUCCESS) + name_max = 0x10; + r = ERROR_OUTOFMEMORY; + name = msi_alloc( name_max * sizeof(WCHAR) ); + if (!name) goto end; - if (type != REG_MULTI_SZ) - { - ERR("component data has wrong type (%ld)\n", type); - goto end; - } - - /* the value size is in bytes */ - val_sz += sizeof(WCHAR); - val = msi_alloc( val_sz ); + val_max = 0x10; + r = ERROR_OUTOFMEMORY; + val = msi_alloc( val_max ); if (!val) goto end; - r = RegEnumValueW( key, iIndex, name, &name_sz, - NULL, &type, (LPBYTE)val, &val_sz ); - if (r != ERROR_SUCCESS) + /* loop until we allocate enough memory */ + while (1) + { + name_sz = name_max; + val_sz = val_max; + r = RegEnumValueW( key, iIndex, name, &name_sz, + NULL, &type, (LPBYTE)val, &val_sz ); + if (r == ERROR_SUCCESS) + break; + if (r != ERROR_MORE_DATA) + goto end; + + if (type != REG_MULTI_SZ) + { + ERR("component data has wrong type (%ld)\n", type); + goto end; + } + + r = ERROR_OUTOFMEMORY; + if ((name_sz+1) >= name_max) + { + name_max *= 2; + msi_free( name ); + name = msi_alloc( name_max * sizeof (WCHAR) ); + if (!name) + goto end; + continue; + } + if (val_sz > val_max) + { + val_max = val_sz + sizeof (WCHAR); + val = msi_alloc( val_max * sizeof (WCHAR) ); + if (!val) + goto end; + continue; + } + ERR("should be enough data, but isn't %ld %ld\n", name_sz, val_sz ); goto end; + } ofs = 0; r = MsiDecomposeDescriptorW( val, NULL, NULL, NULL, &ofs );

1 0

wine/dlls/shdocvw dochost.c
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21357 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 05:59:39 Modified files: dlls/shdocvw : dochost.c Log message: Jacek Caban <jack(a)itma.pwr.wroc.pl> Added GetHostInfo implementation. Patch: http://cvs.winehq.org/patch.py?id=21357 Old revision New revision Changes Path 1.1 1.2 +19 -2 wine/dlls/shdocvw/dochost.c Index: wine/dlls/shdocvw/dochost.c diff -u -p wine/dlls/shdocvw/dochost.c:1.1 wine/dlls/shdocvw/dochost.c:1.2 --- wine/dlls/shdocvw/dochost.c:1.1 21 Nov 2005 11:59:39 -0000 +++ wine/dlls/shdocvw/dochost.c 21 Nov 2005 11:59:39 -0000 @@ -54,8 +54,25 @@ static HRESULT WINAPI DocHostUIHandler_G DOCHOSTUIINFO *pInfo) { WebBrowser *This = DOCHOSTUI_THIS(iface); - FIXME("(%p)->(%p)\n", This, pInfo); - return E_NOTIMPL; + IDocHostUIHandler *handler; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, pInfo); + + if(This->client) { + hres = IOleClientSite_QueryInterface(This->client, &IID_IDocHostUIHandler, (void**)&handler); + if(SUCCEEDED(hres)) { + hres = IDocHostUIHandler_GetHostInfo(handler, pInfo); + IDocHostUIHandler_Release(handler); + if(SUCCEEDED(hres)) + return hres; + } + } + + pInfo->dwFlags = DOCHOSTUIFLAG_DISABLE_HELP_MENU | DOCHOSTUIFLAG_OPENNEWWIN + | DOCHOSTUIFLAG_URL_ENCODING_ENABLE_UTF8 | DOCHOSTUIFLAG_ENABLE_INPLACE_NAVIGATION + | DOCHOSTUIFLAG_IME_ENABLE_RECONVERSION; + return S_OK; } static HRESULT WINAPI DocHostUIHandler_ShowUI(IDocHostUIHandler2 *iface, DWORD dwID,

1 0

wine/ include/lmaccess.h dlls/netapi32/netapi3 ...
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21356 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 05:59:27 Modified files: include : lmaccess.h dlls/netapi32 : netapi32.c access.c Log message: Ge van Geldorp <gvg(a)reactos.org> Fix some prototypes to match the PSDK. Patch: http://cvs.winehq.org/patch.py?id=21356 Old revision New revision Changes Path 1.4 1.5 +1 -1 wine/include/lmaccess.h 1.21 1.22 +1 -1 wine/dlls/netapi32/netapi32.c 1.10 1.11 +4 -4 wine/dlls/netapi32/access.c Index: wine/include/lmaccess.h diff -u -p wine/include/lmaccess.h:1.4 wine/include/lmaccess.h:1.5 --- wine/include/lmaccess.h:1.4 21 Nov 2005 11:59:27 -0000 +++ wine/include/lmaccess.h 21 Nov 2005 11:59:27 -0000 @@ -407,7 +407,7 @@ NET_API_STATUS WINAPI NetUserGetInfo(LPC DWORD level, LPBYTE* bufptr); NET_API_STATUS WINAPI NetQueryDisplayInformation( - LPWSTR ServerName, DWORD Level, DWORD Index, DWORD EntriesRequested, + LPCWSTR ServerName, DWORD Level, DWORD Index, DWORD EntriesRequested, DWORD PreferredMaximumLength, LPDWORD ReturnedEntryCount, PVOID *SortedBuffer); Index: wine/dlls/netapi32/netapi32.c diff -u -p wine/dlls/netapi32/netapi32.c:1.21 wine/dlls/netapi32/netapi32.c:1.22 --- wine/dlls/netapi32/netapi32.c:1.21 21 Nov 2005 11:59:27 -0000 +++ wine/dlls/netapi32/netapi32.c 21 Nov 2005 11:59:27 -0000 @@ -71,7 +71,7 @@ NET_API_STATUS WINAPI NetServerEnum( /************************************************************ * NetServerGetInfo (NETAPI32.@) */ -NET_API_STATUS WINAPI NetServerGetInfo(LPCWSTR servername, DWORD level, LPBYTE* bufptr) +NET_API_STATUS WINAPI NetServerGetInfo(LMSTR servername, DWORD level, LPBYTE* bufptr) { FIXME("stub (%p, %ld, %p)\n", servername, level, bufptr); return ERROR_ACCESS_DENIED; Index: wine/dlls/netapi32/access.c diff -u -p wine/dlls/netapi32/access.c:1.10 wine/dlls/netapi32/access.c:1.11 --- wine/dlls/netapi32/access.c:1.10 21 Nov 2005 11:59:27 -0000 +++ wine/dlls/netapi32/access.c 21 Nov 2005 11:59:27 -0000 @@ -95,8 +95,8 @@ static BOOL NETAPI_IsKnownUser(LPCWSTR U /************************************************************ * NetUserAdd (NETAPI32.@) */ -NET_API_STATUS WINAPI NetUserAdd(LMSTR servername, - DWORD level, LPBYTE* bufptr, LPDWORD parm_err) +NET_API_STATUS WINAPI NetUserAdd(LPCWSTR servername, + DWORD level, LPBYTE bufptr, LPDWORD parm_err) { NET_API_STATUS status; FIXME("(%s, %ld, %p, %p) stub!\n", debugstr_w(servername), level, bufptr, parm_err); @@ -433,7 +433,7 @@ static void ACCESS_CopyDisplayUser(PNET_ */ NET_API_STATUS WINAPI NetQueryDisplayInformation( - LPWSTR ServerName, DWORD Level, DWORD Index, DWORD EntriesRequested, + LPCWSTR ServerName, DWORD Level, DWORD Index, DWORD EntriesRequested, DWORD PreferredMaximumLength, LPDWORD ReturnedEntryCount, PVOID *SortedBuffer) { @@ -540,7 +540,7 @@ NetQueryDisplayInformation( */ NET_API_STATUS WINAPI -NetGetDCName(LPWSTR servername, LPWSTR domainname, LPBYTE *bufptr) +NetGetDCName(LPCWSTR servername, LPCWSTR domainname, LPBYTE *bufptr) { FIXME("(%s, %s, %p) stub!\n", debugstr_w(servername), debugstr_w(domainname), bufptr);

1 0

wine/dlls/kernel oldconfig.c
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21355 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 05:59:03 Modified files: dlls/kernel : oldconfig.c Log message: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> - ANSI SCSI revision is a hex number. - Be more verbose with parser ERRs. Patch: http://cvs.winehq.org/patch.py?id=21355 Old revision New revision Changes Path 1.10 1.11 +4 -4 wine/dlls/kernel/oldconfig.c Index: wine/dlls/kernel/oldconfig.c diff -u -p wine/dlls/kernel/oldconfig.c:1.10 wine/dlls/kernel/oldconfig.c:1.11 --- wine/dlls/kernel/oldconfig.c:1.10 21 Nov 2005 11:59: 3 -0000 +++ wine/dlls/kernel/oldconfig.c 21 Nov 2005 11:59: 3 -0000 @@ -301,7 +301,7 @@ static int SCSI_getprocentry( FILE * pro } if( result != 4 ) { - ERR("bus id line scan count error\n"); + ERR("bus id line scan count error (fscanf returns %d, expected 4)\n", result); return 0; } result = fscanf( procfile, @@ -311,17 +311,17 @@ static int SCSI_getprocentry( FILE * pro dev->rev ); if( result != 3 ) { - ERR("model line scan count error\n"); + ERR("model line scan count error (fscanf returns %d, expected 3)\n", result); return 0; } result = fscanf( procfile, - " Type:%*3[ ]%32c%*1[ ]ANSI%*1[ ]SCSI%*1[ ]revision:%*1[ ]%d\n", + " Type:%*3[ ]%32c%*1[ ]ANSI%*1[ ]SCSI%*1[ ]revision:%*1[ ]%x\n", dev->type, &dev->ansirev ); if( result != 2 ) { - ERR("SCSI type line scan count error\n"); + ERR("SCSI type line scan count error (fscanf returns %d, expected 2)\n", result); return 0; } /* Since we fscanf with %XXc instead of %s.. put a NULL at end */

1 0

wine/dlls rpcrt4/rpcrt4.spec mswsock/mswsock.spec
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21354 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 05:58:49 Modified files: dlls/rpcrt4 : rpcrt4.spec dlls/mswsock : mswsock.spec Log message: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Mark some functions as implemented in the spec files. Patch: http://cvs.winehq.org/patch.py?id=21354 Old revision New revision Changes Path 1.59 1.60 +1 -1 wine/dlls/rpcrt4/rpcrt4.spec 1.3 1.4 +1 -1 wine/dlls/mswsock/mswsock.spec Index: wine/dlls/rpcrt4/rpcrt4.spec diff -u -p wine/dlls/rpcrt4/rpcrt4.spec:1.59 wine/dlls/rpcrt4/rpcrt4.spec:1.60 --- wine/dlls/rpcrt4/rpcrt4.spec:1.59 21 Nov 2005 11:58:49 -0000 +++ wine/dlls/rpcrt4/rpcrt4.spec 21 Nov 2005 11:58:49 -0000 @@ -247,7 +247,7 @@ @ stdcall NdrInterfacePointerMemorySize(ptr ptr) @ stdcall NdrInterfacePointerUnmarshall(ptr ptr ptr long) @ stub NdrIsAppDoneWithPipes -@ stub NdrMapCommAndFaultStatus +@ stdcall NdrMapCommAndFaultStatus(ptr ptr ptr long) @ stub NdrMarkNextActivePipe @ stub NdrMesProcEncodeDecode2 @ stub NdrMesProcEncodeDecode Index: wine/dlls/mswsock/mswsock.spec diff -u -p wine/dlls/mswsock/mswsock.spec:1.3 wine/dlls/mswsock/mswsock.spec:1.4 --- wine/dlls/mswsock/mswsock.spec:1.3 21 Nov 2005 11:58:49 -0000 +++ wine/dlls/mswsock/mswsock.spec 21 Nov 2005 11:58:49 -0000 @@ -1,7 +1,7 @@ @ stdcall AcceptEx(long long ptr long long long ptr ptr) @ stdcall EnumProtocolsA(ptr ptr ptr) ws2_32.WSAEnumProtocolsA @ stdcall EnumProtocolsW(ptr ptr ptr) ws2_32.WSAEnumProtocolsW -@ stub GetAcceptExSockaddrs +@ stdcall GetAcceptExSockaddrs(ptr long long long ptr ptr ptr ptr) @ stub GetAddressByNameA @ stub GetAddressByNameW @ stub GetNameByTypeA

1 0

wine/programs/winecfg driveui.c
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21353 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 05:58:29 Modified files: programs/winecfg: driveui.c Log message: Vitaliy Margolen <wine-patch(a)kievinfo.com> Create new drives with autodetect type. Patch: http://cvs.winehq.org/patch.py?id=21353 Old revision New revision Changes Path 1.26 1.27 +1 -1 wine/programs/winecfg/driveui.c Index: wine/programs/winecfg/driveui.c diff -u -p wine/programs/winecfg/driveui.c:1.26 wine/programs/winecfg/driveui.c:1.27 --- wine/programs/winecfg/driveui.c:1.26 21 Nov 2005 11:58:29 -0000 +++ wine/programs/winecfg/driveui.c 21 Nov 2005 11:58:29 -0000 @@ -358,7 +358,7 @@ static void on_add_click(HWND dialog) WINE_TRACE("allocating drive letter %c\n", new); if (new == 'C') add_drive(new, "../drive_c", "System Drive", "", DRIVE_FIXED); - else add_drive(new, "/", "", "", DRIVE_FIXED); + else add_drive(new, "/", "", "", DRIVE_UNKNOWN); fill_drives_list(dialog);

1 0

wine/dlls/msvcrt/tests file.c
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21352 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 05:58:11 Modified files: dlls/msvcrt/tests: file.c Log message: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Minor MSVCRT test changes: - add two invalid parameter checks for fopen(), - rearrange test sequence into two parts (low-level and stream I/O), - break long line. Patch: http://cvs.winehq.org/patch.py?id=21352 Old revision New revision Changes Path 1.20 1.21 +16 -5 wine/dlls/msvcrt/tests/file.c Index: wine/dlls/msvcrt/tests/file.c diff -u -p wine/dlls/msvcrt/tests/file.c:1.20 wine/dlls/msvcrt/tests/file.c:1.21 --- wine/dlls/msvcrt/tests/file.c:1.20 21 Nov 2005 11:58:11 -0000 +++ wine/dlls/msvcrt/tests/file.c 21 Nov 2005 11:58:11 -0000 @@ -411,7 +411,7 @@ static void test_fopen_fclose_fcloseall( char fname1[] = "empty1"; char fname2[] = "empty2"; char fname3[] = "empty3"; - FILE *stream1, *stream2, *stream3; + FILE *stream1, *stream2, *stream3, *stream4; int ret, numclosed; /* testing fopen() */ @@ -424,6 +424,14 @@ static void test_fopen_fclose_fcloseall( ok(stream3 == NULL, "The file '%s' shouldn't exist before\n", fname3 ); stream3 = fopen(fname3, "w+"); ok(stream3 != NULL, "The file '%s' should be opened now\n", fname3 ); + errno = 0xfaceabad; + stream4 = fopen("", "w+"); + ok(stream4 == NULL && errno == ENOENT, + "filename is empty, errno = %d (expected 2)\n", errno); + errno = 0xfaceabad; + stream4 = fopen(NULL, "w+"); + ok(stream4 == NULL && (errno == EINVAL || errno == ENOENT), + "filename is NULL, errno = %d (expected 2 or 22)\n", errno); /* testing fclose() */ ret = fclose(stream2); @@ -454,19 +462,22 @@ START_TEST(file) arg_c = winetest_get_mainargs( &arg_v ); + /* testing low-level I/O */ if (arg_c >= 3) { - if (arg_c == 3) test_file_inherit_child(arg_v[2]); else test_file_inherit_child_no(arg_v[2]); + if (arg_c == 3) test_file_inherit_child(arg_v[2]); + else test_file_inherit_child_no(arg_v[2]); return; } + test_file_inherit(arg_v[0]); + test_file_write_read(); + test_chsize(); + /* testing stream I/O */ test_fdopen(); test_fopen_fclose_fcloseall(); test_fileops(); test_fgetwc(); test_file_put_get(); - test_file_write_read(); - test_file_inherit(arg_v[0]); test_tmpnam(); - test_chsize(); }

1 0

wine/dlls/wldap32 value.c
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21351 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 05:57:52 Modified files: dlls/wldap32 : value.c Log message: Hans Leidekker <hans(a)it.vu.nl> Fix the build without openldap. Patch: http://cvs.winehq.org/patch.py?id=21351 Old revision New revision Changes Path 1.2 1.3 +2 -0 wine/dlls/wldap32/value.c Index: wine/dlls/wldap32/value.c diff -u -p wine/dlls/wldap32/value.c:1.2 wine/dlls/wldap32/value.c:1.3 --- wine/dlls/wldap32/value.c:1.2 21 Nov 2005 11:57:52 -0000 +++ wine/dlls/wldap32/value.c 21 Nov 2005 11:57:52 -0000 @@ -117,6 +117,7 @@ PCHAR *ldap_get_valuesA( WLDAP32_LDAP *l return ret; } +#ifdef HAVE_LDAP static char *bv2str( struct berval *bv ) { char *str = NULL; @@ -163,6 +164,7 @@ static char **bv2str_array( struct berva str[i] = NULL; return str; } +#endif PWCHAR *ldap_get_valuesW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry, PWCHAR attr ) {

1 0