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

Huw Davies : msdaps: Implement ICreateRow_CreateRow proxy and stub.
by Alexandre Julliard Aug. 25, 2009

Aug. 25, 2009

Module: wine Branch: master Commit: 21137fe269266eb15c3ec42e3d68371173a273e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21137fe269266eb15c3ec42e3… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 25 13:35:58 2009 +0100 msdaps: Implement ICreateRow_CreateRow proxy and stub. --- dlls/msdaps/usrmarshal.c | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 0b59465..9712c26 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -388,9 +388,15 @@ HRESULT CALLBACK ICreateRow_CreateRow_Proxy(ICreateRow* This, IUnknown *pUnkOute REFGUID rguid, REFIID riid, IAuthenticate *pAuthenticate, DBIMPLICITSESSION *pImplSession, DBBINDURLSTATUS *pdwBindStatus, LPOLESTR *ppwszNewURL, IUnknown **ppUnk) { - FIXME("(%p, %p, %s, %08x, %s, %s, %p, %p, %p, %p, %p): stub\n", This, pUnkOuter, debugstr_w(pwszURL), dwBindURLFlags, + HRESULT hr; + + TRACE("(%p, %p, %s, %08x, %s, %s, %p, %p, %p, %p, %p)\n", This, pUnkOuter, debugstr_w(pwszURL), dwBindURLFlags, debugstr_guid(rguid), debugstr_guid(riid), pAuthenticate, pImplSession, pdwBindStatus, ppwszNewURL, ppUnk); - return E_NOTIMPL; + + hr = ICreateRow_RemoteCreateRow_Proxy(This, pUnkOuter, pwszURL, dwBindURLFlags, rguid, riid, pAuthenticate, + pImplSession ? pImplSession->pUnkOuter : NULL, pImplSession ? pImplSession->piid : NULL, + pImplSession ? &pImplSession->pSession : NULL, pdwBindStatus, ppwszNewURL, ppUnk); + return hr; } HRESULT __RPC_STUB ICreateRow_CreateRow_Stub(ICreateRow* This, IUnknown *pUnkOuter, LPCOLESTR pwszURL, DBBINDURLFLAG dwBindURLFlags, @@ -398,8 +404,20 @@ HRESULT __RPC_STUB ICreateRow_CreateRow_Stub(ICreateRow* This, IUnknown *pUnkOut IID *piid, IUnknown **ppSession, DBBINDURLSTATUS *pdwBindStatus, LPOLESTR *ppwszNewURL, IUnknown **ppUnk) { - FIXME("(%p, %p, %s, %08x, %s, %s, %p, %p, %p, %p, %p, %p, %p): stub\n", This, pUnkOuter, debugstr_w(pwszURL), dwBindURLFlags, + HRESULT hr; + DBIMPLICITSESSION impl_session; + + TRACE("(%p, %p, %s, %08x, %s, %s, %p, %p, %p, %p, %p, %p, %p)\n", This, pUnkOuter, debugstr_w(pwszURL), dwBindURLFlags, debugstr_guid(rguid), debugstr_guid(riid), pAuthenticate, pSessionUnkOuter, piid, ppSession, pdwBindStatus, ppwszNewURL, ppUnk); - return E_NOTIMPL; + + impl_session.pUnkOuter = pSessionUnkOuter; + impl_session.piid = piid; + impl_session.pSession = NULL; + + hr = ICreateRow_CreateRow(This, pUnkOuter, pwszURL, dwBindURLFlags, rguid, riid, pAuthenticate, + ppSession ? &impl_session : NULL, pdwBindStatus, ppwszNewURL, ppUnk); + + if(ppSession) *ppSession = impl_session.pSession; + return hr; }

1 0

Huw Davies : msdaps: Use 2 byte structure packing for win32 code.
by Alexandre Julliard Aug. 25, 2009

Aug. 25, 2009

Module: wine Branch: master Commit: 1591d197b689bf1f00d8b3f561bb8c3f091ca01f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1591d197b689bf1f00d8b3f56… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 25 13:34:58 2009 +0100 msdaps: Use 2 byte structure packing for win32 code. --- dlls/msdaps/Makefile.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msdaps/Makefile.in b/dlls/msdaps/Makefile.in index 3eba6b2..0f65343 100644 --- a/dlls/msdaps/Makefile.in +++ b/dlls/msdaps/Makefile.in @@ -5,6 +5,7 @@ VPATH = @srcdir@ MODULE = msdaps.dll IMPORTS = oleaut32 ole32 rpcrt4 kernel32 ntdll EXTRADEFS = -DREGISTER_PROXY_DLL -DPROXY_CLSID_IS="{ 0x06210e88, 0x01f5, 0x11d1, { 0xb5, 0x12, 0x00, 0x80, 0xc7, 0x81, 0xc3, 0x84 } }" +EXTRAIDLFLAGS = --win32-align=2 EXTRA_OBJS = dlldata.o

1 0

Huw Davies : widl: Add separate --win32-align and --win64-align options.
by Alexandre Julliard Aug. 25, 2009

Aug. 25, 2009

Module: wine Branch: master Commit: b524c55021eccbd25c39b54df694ccc90212f38b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b524c55021eccbd25c39b54df… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 25 13:29:47 2009 +0100 widl: Add separate --win32-align and --win64-align options. --- tools/widl/typegen.c | 16 +++++++++++----- tools/widl/widl.c | 25 ++++++++++++++++++------- tools/widl/widl.h | 3 ++- 3 files changed, 31 insertions(+), 13 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index d9a2c0d..e7e8980 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -144,6 +144,13 @@ unsigned char get_basic_fc(const type_t *type) } } +static inline unsigned int clamp_align(unsigned int align) +{ + unsigned int packing = (pointer_size == 4) ? win32_packing : win64_packing; + if(align > packing) align = packing; + return align; +} + unsigned char get_pointer_fc(const type_t *type, const attr_list_t *attrs, int toplevel_param) { const type_t *t; @@ -1164,13 +1171,12 @@ static unsigned int fields_memsize(const var_list_t *fields, unsigned int *align unsigned int falign = 0; unsigned int fsize = type_memsize(v->type, &falign); if (*align < falign) *align = falign; - if (falign > packing) falign = packing; + falign = clamp_align(falign); size = ROUND_SIZE(size, falign); size += fsize; } - max_align = *align; - if(max_align > packing) max_align = packing; + max_align = clamp_align(*align); size = ROUND_SIZE(size, max_align); return size; @@ -1210,7 +1216,7 @@ int get_padding(const var_list_t *fields) type_t *ft = f->type; unsigned int align = 0; unsigned int size = type_memsize(ft, &align); - if (align > packing) align = packing; + align = clamp_align(align); if (align > salign) salign = align; offset = ROUND_SIZE(offset, align); offset += size; @@ -2279,7 +2285,7 @@ static void write_struct_members(FILE *file, const type_t *type, type_t *ft = field->type; unsigned int align = 0; unsigned int size = type_memsize(ft, &align); - if(align > packing) align = packing; + align = clamp_align(align); if (salign < align) salign = align; if (!is_conformant_array(ft) || type_array_is_decl_as_ptr(ft)) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 38e05cf..60322d3 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -52,7 +52,6 @@ static const char usage[] = "Usage: widl [options...] infile.idl\n" " or: widl [options...] --dlldata-only name1 [name2...]\n" -" -a n Set structure alignment to 'n'\n" " -b arch Set the target architecture\n" " -c Generate client stub\n" " -C file Name of client stub file (default is infile_c.c)\n" @@ -82,6 +81,8 @@ static const char usage[] = " -W Enable pedantic warnings\n" " --win32 Only generate 32-bit code\n" " --win64 Only generate 64-bit code\n" +" --win32-align n Set win32 structure alignment to 'n'\n" +" --win64-align n Set win64 structure alignment to 'n'\n" "Debug level 'n' is a bitmask with following meaning:\n" " * 0x01 Tell which resource is parsed (verbose mode)\n" " * 0x02 Dump internal structures\n" @@ -111,7 +112,8 @@ int no_preprocess = 0; int old_names = 0; int do_win32 = 1; int do_win64 = 1; -int packing = 8; +int win32_packing = 8; +int win64_packing = 8; char *input_name; char *header_name; @@ -150,11 +152,13 @@ enum { PREFIX_CLIENT_OPTION, PREFIX_SERVER_OPTION, WIN32_OPTION, - WIN64_OPTION + WIN64_OPTION, + WIN32_ALIGN_OPTION, + WIN64_ALIGN_OPTION }; static const char short_options[] = - "a:b:cC:d:D:EhH:I:m:NpP:sS:tT:uU:VW"; + "b:cC:d:D:EhH:I:m:NpP:sS:tT:uU:VW"; static const struct option long_options[] = { { "dlldata", 1, 0, DLLDATA_OPTION }, { "dlldata-only", 0, 0, DLLDATA_ONLY_OPTION }, @@ -165,6 +169,8 @@ static const struct option long_options[] = { { "prefix-server", 1, 0, PREFIX_SERVER_OPTION }, { "win32", 0, 0, WIN32_OPTION }, { "win64", 0, 0, WIN64_OPTION }, + { "win32-align", 1, 0, WIN32_ALIGN_OPTION }, + { "win64-align", 1, 0, WIN64_ALIGN_OPTION }, { 0, 0, 0, 0 } }; @@ -522,9 +528,14 @@ int main(int argc,char *argv[]) do_win32 = 0; do_win64 = 1; break; - case 'a': - packing = strtol(optarg, NULL, 0); - if(packing != 2 && packing != 4 && packing != 8) + case WIN32_ALIGN_OPTION: + win32_packing = strtol(optarg, NULL, 0); + if(win32_packing != 2 && win32_packing != 4 && win32_packing != 8) + error("Packing must be one of 2, 4 or 8\n"); + break; + case WIN64_ALIGN_OPTION: + win64_packing = strtol(optarg, NULL, 0); + if(win64_packing != 2 && win64_packing != 4 && win64_packing != 8) error("Packing must be one of 2, 4 or 8\n"); break; case 'b': diff --git a/tools/widl/widl.h b/tools/widl/widl.h index d6a46fc..5de2cba 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -46,7 +46,8 @@ extern int do_dlldata; extern int old_names; extern int do_win32; extern int do_win64; -extern int packing; +extern int win32_packing; +extern int win64_packing; extern char *input_name; extern char *header_name;

1 0

Ge van Geldorp : crypt32/tests: Remove test that crashes on Win7.
by Alexandre Julliard Aug. 25, 2009

Aug. 25, 2009

Module: wine Branch: master Commit: ca18de9512f2ad42308a7ef4052a671ad283a905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca18de9512f2ad42308a7ef40… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Tue Aug 25 12:40:28 2009 +0200 crypt32/tests: Remove test that crashes on Win7. --- dlls/crypt32/tests/chain.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index c880df9..8b4d36f 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -75,10 +75,8 @@ static void testCreateCertChainEngine(void) /* Crash ret = pCertCreateCertificateChainEngine(NULL, NULL); ret = pCertCreateCertificateChainEngine(NULL, &engine); - */ ret = pCertCreateCertificateChainEngine(&config, NULL); - ok(!ret && GetLastError() == E_INVALIDARG, - "Expected E_INVALIDARG, got %08x\n", GetLastError()); + */ ret = pCertCreateCertificateChainEngine(&config, &engine); ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError());

1 0

Alexandre Julliard : libwine: Determine the bin directory independently from the lib directory if possible .
by Alexandre Julliard Aug. 25, 2009

Aug. 25, 2009

Module: wine Branch: master Commit: 995e55371593e4bdcc22aa9e256bb6d42b20f5bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=995e55371593e4bdcc22aa9e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 25 12:47:50 2009 +0200 libwine: Determine the bin directory independently from the lib directory if possible. Prefer the bin directory when getting the data dir location. --- libs/wine/Makefile.in | 1 - libs/wine/config.c | 155 +++++++++++++++++++++++++++++-------------------- 2 files changed, 91 insertions(+), 65 deletions(-) diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 7e7baf1..5af1f94 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -111,7 +111,6 @@ CONFIGDIRS = \ -DLIB_TO_BINDIR=\"`$(RELPATH) $(libdir) $(bindir)`\" \ -DLIB_TO_DLLDIR=\"`$(RELPATH) $(libdir) $(dlldir)`\" \ -DBIN_TO_DLLDIR=\"`$(RELPATH) $(bindir) $(dlldir)`\" \ - -DLIB_TO_DATADIR=\"`$(RELPATH) $(libdir) $(datadir)/wine`\" \ -DBIN_TO_DATADIR=\"`$(RELPATH) $(bindir) $(datadir)/wine`\" config.o: config.c $(RELPATH) diff --git a/libs/wine/config.c b/libs/wine/config.c index 280241c..6bb87b0 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -137,6 +137,63 @@ static char *get_runtime_libdir(void) return NULL; } +/* return the directory that contains the main exe at run-time */ +static char *get_runtime_bindir( const char *argv0 ) +{ + char *p, *bindir, *cwd; + size_t len, size; + +#ifdef linux + for (size = 256; ; size *= 2) + { + int ret; + if (!(bindir = malloc( size ))) break; + if ((ret = readlink( "/proc/self/exe", bindir, size )) == -1) break; + if (ret != size) + { + if (!(p = memrchr( bindir, '/', ret ))) break; + if (p == bindir) p++; + *p = 0; + return bindir; + } + free( bindir ); + } + free( bindir ); +#endif + + if (!(p = strrchr( argv0, '/' ))) return NULL; + + len = p - argv0; + if (!len) len++; /* include leading slash */ + + if (argv0[0] == '/') /* absolute path */ + { + bindir = xmalloc( len + 1 ); + memcpy( bindir, argv0, len ); + bindir[len] = 0; + } + else + { + /* relative path, make it absolute */ + for (size = 256 + len; ; size *= 2) + { + if (!(cwd = malloc( size ))) return NULL; + if (getcwd( cwd, size - len )) + { + bindir = cwd; + cwd += strlen(cwd); + *cwd++ = '/'; + memcpy( cwd, argv0, len ); + cwd[len] = 0; + break; + } + free( cwd ); + if (errno != ERANGE) return NULL; + } + } + return bindir; +} + /* initialize the server directory value */ static void init_server_dir( dev_t dev, ino_t ino ) { @@ -235,6 +292,16 @@ static void init_paths(void) init_server_dir( st.st_dev, st.st_ino ); } +/* check if bindir is valid by checking for wineserver */ +static int is_valid_bindir( const char *bindir ) +{ + struct stat st; + char *path = build_path( bindir, "wineserver" ); + int ret = (stat( path, &st ) != -1); + free( path ); + return ret; +} + /* check if basedir is a valid build dir by checking for wineserver and ntdll */ /* helper for running_from_build_dir */ static inline int is_valid_build_dir( char *basedir, int baselen ) @@ -252,17 +319,10 @@ static inline int is_valid_build_dir( char *basedir, int baselen ) } /* check if we are running from the build directory */ -static char *running_from_build_dir( const char *basedir, const char *bindir ) +static char *running_from_build_dir( const char *basedir ) { - struct stat st; const char *p; char *path; - int res; - - if (!(path = build_path( bindir, "wineserver" ))) return NULL; - res = stat( path, &st ); - free( path ); - if (res != -1) return NULL; /* the real bindir is valid */ /* remove last component from basedir */ p = basedir + strlen(basedir) - 1; @@ -289,73 +349,40 @@ static char *running_from_build_dir( const char *basedir, const char *bindir ) /* initialize the argv0 path */ void wine_init_argv0_path( const char *argv0 ) { - size_t size, len; - const char *p, *basename; - char *cwd, *libdir; + const char *basename; + char *libdir; - if (!(p = strrchr( argv0, '/' ))) - basename = argv0; - else - basename = p + 1; + if (!(basename = strrchr( argv0, '/' ))) basename = argv0; + else basename++; - argv0_name = xstrdup( basename ); + bindir = get_runtime_bindir( argv0 ); + libdir = get_runtime_libdir(); - if ((libdir = get_runtime_libdir())) + if (bindir && !is_valid_bindir( bindir )) { - bindir = build_path( libdir, LIB_TO_BINDIR ); - if ((build_dir = running_from_build_dir( libdir, bindir ))) - { - free( libdir ); - goto in_build_dir; - } - dlldir = build_path( libdir, LIB_TO_DLLDIR ); - datadir = build_path( libdir, LIB_TO_DATADIR ); - free( libdir ); - return; + build_dir = running_from_build_dir( bindir ); + free( bindir ); + bindir = NULL; + } + if (libdir && !bindir && !build_dir) + { + build_dir = running_from_build_dir( libdir ); + if (!build_dir) bindir = build_path( libdir, LIB_TO_BINDIR ); } - if (!p) return; /* if argv0 doesn't contain a path, don't store anything */ - - len = p - argv0; - if (!len) len++; /* include leading slash */ - - if (argv0[0] == '/') /* absolute path */ + if (build_dir) { - bindir = xmalloc( len + 1 ); - memcpy( bindir, argv0, len ); - bindir[len] = 0; + argv0_name = build_path( "loader/", basename ); } else { - /* relative path, make it absolute */ - for (size = 256 + len; ; size *= 2) - { - if (!(cwd = malloc( size ))) return; - if (getcwd( cwd, size - len )) - { - bindir = cwd; - cwd += strlen(cwd); - *cwd++ = '/'; - memcpy( cwd, argv0, len ); - cwd[len] = 0; - break; - } - free( cwd ); - if (errno != ERANGE) return; - } - } - - if ((build_dir = running_from_build_dir( bindir, bindir ))) goto in_build_dir; - - dlldir = build_path( bindir, BIN_TO_DLLDIR ); - datadir = build_path( bindir, BIN_TO_DATADIR ); - return; + if (libdir) dlldir = build_path( libdir, LIB_TO_DLLDIR ); + else if (bindir) dlldir = build_path( bindir, BIN_TO_DLLDIR ); -in_build_dir: - free( bindir ); - free( argv0_name ); - bindir = NULL; - argv0_name = build_path( "loader/", basename ); + if (bindir) datadir = build_path( bindir, BIN_TO_DATADIR ); + argv0_name = xstrdup( basename ); + } + free( libdir ); } /* return the configuration directory ($WINEPREFIX or $HOME/.wine) */

1 0

Austin English : dxdiag: Add stub implementation.
by Alexandre Julliard Aug. 25, 2009

Aug. 25, 2009

Module: wine Branch: master Commit: b3fb793b527c0518ce854ba59c2faf41a2b043b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3fb793b527c0518ce854ba59… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Aug 24 11:18:26 2009 -0500 dxdiag: Add stub implementation. --- configure | 10 ++++++++++ configure.ac | 1 + programs/dxdiag/Makefile.in | 15 +++++++++++++++ programs/dxdiag/main.c | 27 +++++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 9a01fce..14a5d93 100755 --- a/configure +++ b/configure @@ -17154,6 +17154,15 @@ programs/control/Makefile: programs/control/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/control/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + programs/dxdiag/Makefile" +test "x$enable_dxdiag" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + dxdiag" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + dxdiag" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +programs/dxdiag/Makefile: programs/dxdiag/Makefile.in programs/Makeprog.rules" +ac_config_files="$ac_config_files programs/dxdiag/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/eject/Makefile" test "x$enable_eject" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ eject" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ @@ -18804,6 +18813,7 @@ do "programs/cmd/Makefile") CONFIG_FILES="$CONFIG_FILES programs/cmd/Makefile" ;; "programs/cmdlgtst/Makefile") CONFIG_FILES="$CONFIG_FILES programs/cmdlgtst/Makefile" ;; "programs/control/Makefile") CONFIG_FILES="$CONFIG_FILES programs/control/Makefile" ;; + "programs/dxdiag/Makefile") CONFIG_FILES="$CONFIG_FILES programs/dxdiag/Makefile" ;; "programs/eject/Makefile") CONFIG_FILES="$CONFIG_FILES programs/eject/Makefile" ;; "programs/expand/Makefile") CONFIG_FILES="$CONFIG_FILES programs/expand/Makefile" ;; "programs/explorer/Makefile") CONFIG_FILES="$CONFIG_FILES programs/explorer/Makefile" ;; diff --git a/configure.ac b/configure.ac index 4b37e5f..015f6ba 100644 --- a/configure.ac +++ b/configure.ac @@ -2517,6 +2517,7 @@ WINE_CONFIG_MAKEFILE([programs/clock/Makefile],[programs/Makeprog.rules],[progra WINE_CONFIG_MAKEFILE([programs/cmd/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/cmdlgtst/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS]) WINE_CONFIG_MAKEFILE([programs/control/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/dxdiag/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/eject/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/expand/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/explorer/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) diff --git a/programs/dxdiag/Makefile.in b/programs/dxdiag/Makefile.in new file mode 100644 index 0000000..2e7e7b0 --- /dev/null +++ b/programs/dxdiag/Makefile.in @@ -0,0 +1,15 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = dxdiag.exe +APPMODE = -mwindows +IMPORTS = kernel32 + +C_SRCS = \ + main.c + +(a)MAKE_PROG_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/programs/dxdiag/main.c b/programs/dxdiag/main.c new file mode 100644 index 0000000..d24945c --- /dev/null +++ b/programs/dxdiag/main.c @@ -0,0 +1,27 @@ +/* + * DxDiag Implementation + * + * Copyright 2009 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR cmdline, int cmdshow) +{ + return 0; +}

1 0

Mike Kaplinskiy : ws2_32/tests: Fix failure on NT4.
by Alexandre Julliard Aug. 25, 2009

Aug. 25, 2009

Module: wine Branch: master Commit: d2065e3dc9b947f4548bb9108e9b264bde0ddd14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2065e3dc9b947f4548bb9108… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Mon Aug 24 14:10:25 2009 -0400 ws2_32/tests: Fix failure on NT4. --- dlls/ws2_32/tests/sock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b927868..82c53e2 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2904,7 +2904,7 @@ static void test_AcceptEx(void) } iret = connect(acceptor, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); - ok(iret == SOCKET_ERROR && WSAGetLastError() == WSAEINVAL, + ok((iret == SOCKET_ERROR && WSAGetLastError() == WSAEINVAL) || broken(!iret) /* NT4 */, "connecting to acceptex acceptor succeeded? return %d + errno %d\n", iret, WSAGetLastError()); if (!iret || (iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK)) { /* We need to cancel this call, otherwise things fail */

1 0

Detlef Riekenberg : regedit: Do not write junk after the LastKey value.
by Alexandre Julliard Aug. 25, 2009

Aug. 25, 2009

Module: wine Branch: master Commit: 69b3782a825e3c36e77f2c6c8dedc7f7bf2efb61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69b3782a825e3c36e77f2c6c8… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Aug 25 10:21:58 2009 +0200 regedit: Do not write junk after the LastKey value. --- programs/regedit/childwnd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index a7e4666..1e7171a 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -264,7 +264,7 @@ static void set_last_key(HWND hwndTV) if (RegCreateKeyExW(HKEY_CURRENT_USER, wszKeyName, 0, NULL, 0, KEY_WRITE, NULL, &hkey, NULL) == ERROR_SUCCESS) { wszVal = GetItemFullPath(g_pChildWnd->hTreeWnd, TreeView_GetSelection(g_pChildWnd->hTreeWnd), FALSE); - RegSetValueExW(hkey, wszLastKey, 0, REG_SZ, (LPBYTE)wszVal, KEY_MAX_LEN * sizeof(WCHAR)); + RegSetValueExW(hkey, wszLastKey, 0, REG_SZ, (LPBYTE)wszVal, (lstrlenW(wszVal) + 1) * sizeof(WCHAR)); HeapFree(GetProcessHeap(), 0, wszVal); RegCloseKey(hkey); }

1 0

Detlef Riekenberg : ws2_32/tests: Add tests for setsockopt with invalid levels.
by Alexandre Julliard Aug. 25, 2009

Aug. 25, 2009

Module: wine Branch: master Commit: 2b345484bc12835b943055acd008f9d49b7f1e3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b345484bc12835b943055acd… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Aug 25 00:04:39 2009 +0200 ws2_32/tests: Add tests for setsockopt with invalid levels. --- dlls/ws2_32/tests/sock.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index a83694f..b927868 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1018,6 +1018,23 @@ static void test_set_getsockopt(void) ok(lasterr == WSAEFAULT, "setsockopt with optval being a value " "returned 0x%08x, not WSAEFAULT(0x%08x)\n", lasterr, WSAEFAULT); + + /* SO_RCVTIMEO with invalid values for level */ + size = sizeof(timeout); + timeout = SOCKTIMEOUT1; + SetLastError(0xdeadbeef); + err = setsockopt(s, 0xffffffff, SO_RCVTIMEO, (char *) &timeout, size); + ok( (err == SOCKET_ERROR) && (WSAGetLastError() == WSAEINVAL), + "got %d with %d (expected SOCKET_ERROR with WSAEINVAL\n", + err, WSAGetLastError()); + + timeout = SOCKTIMEOUT1; + SetLastError(0xdeadbeef); + err = setsockopt(s, 0x00008000, SO_RCVTIMEO, (char *) &timeout, size); + ok( (err == SOCKET_ERROR) && (WSAGetLastError() == WSAEINVAL), + "got %d with %d (expected SOCKET_ERROR with WSAEINVAL\n", + err, WSAGetLastError()); + closesocket(s); }

1 0

Detlef Riekenberg : ws2_32/tests: Add tests for getsockopt with invalid levels.
by Alexandre Julliard Aug. 25, 2009

Aug. 25, 2009

Module: wine Branch: master Commit: a563d670a0296bcd9228ae77b4a3472be3fca883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a563d670a0296bcd9228ae77b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Aug 24 23:43:08 2009 +0200 ws2_32/tests: Add tests for getsockopt with invalid levels. --- dlls/ws2_32/tests/sock.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e16fe21..a83694f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2042,6 +2042,43 @@ static void test_extendedSocketOptions(void) ok((optval == 65507) || (optval == 65527), "SO_MAX_MSG_SIZE reported %d, expected 65507 or 65527\n", optval); + /* IE 3 use 0xffffffff instead of SOL_SOCKET (0xffff) */ + SetLastError(0xdeadbeef); + optval = 0xdeadbeef; + ret = getsockopt(sock, 0xffffffff, SO_MAX_MSG_SIZE, (char *)&optval, &optlen); + ok( (ret == SOCKET_ERROR) && (WSAGetLastError() == WSAEINVAL), + "got %d with %d and optval: 0x%x/%d (expected SOCKET_ERROR with WSAEINVAL)\n", + ret, WSAGetLastError(), optval, optval); + + /* more invalid values for level */ + SetLastError(0xdeadbeef); + optval = 0xdeadbeef; + ret = getsockopt(sock, 0x1234ffff, SO_MAX_MSG_SIZE, (char *)&optval, &optlen); + ok( (ret == SOCKET_ERROR) && (WSAGetLastError() == WSAEINVAL), + "got %d with %d and optval: 0x%x/%d (expected SOCKET_ERROR with WSAEINVAL)\n", + ret, WSAGetLastError(), optval, optval); + + SetLastError(0xdeadbeef); + optval = 0xdeadbeef; + ret = getsockopt(sock, 0x8000ffff, SO_MAX_MSG_SIZE, (char *)&optval, &optlen); + ok( (ret == SOCKET_ERROR) && (WSAGetLastError() == WSAEINVAL), + "got %d with %d and optval: 0x%x/%d (expected SOCKET_ERROR with WSAEINVAL)\n", + ret, WSAGetLastError(), optval, optval); + + SetLastError(0xdeadbeef); + optval = 0xdeadbeef; + ret = getsockopt(sock, 0x00008000, SO_MAX_MSG_SIZE, (char *)&optval, &optlen); + ok( (ret == SOCKET_ERROR) && (WSAGetLastError() == WSAEINVAL), + "got %d with %d and optval: 0x%x/%d (expected SOCKET_ERROR with WSAEINVAL)\n", + ret, WSAGetLastError(), optval, optval); + + SetLastError(0xdeadbeef); + optval = 0xdeadbeef; + ret = getsockopt(sock, 0x00000800, SO_MAX_MSG_SIZE, (char *)&optval, &optlen); + ok( (ret == SOCKET_ERROR) && (WSAGetLastError() == WSAEINVAL), + "got %d with %d and optval: 0x%x/%d (expected SOCKET_ERROR with WSAEINVAL)\n", + ret, WSAGetLastError(), optval, optval); + optlen = sizeof(LINGER); ret = getsockopt(sock, SOL_SOCKET, SO_LINGER, (char *)&linger_val, &optlen); todo_wine{

1 0