wine-commits February 2010

wine-commits@winehq.org

2 participants
783 discussions

Alexandre Julliard : makefiles: Add helper functions to build the various make lists more efficiently.
by Alexandre Julliard 12 Feb '10

12 Feb '10

Module: wine Branch: master Commit: 2de10c4a4244c612674d7f9cad9b608799a9790e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2de10c4a4244c612674d7f9ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 11 23:23:45 2010 +0100 makefiles: Add helper functions to build the various make lists more efficiently. --- aclocal.m4 | 89 +- configure | 7614 ++++++++++++++++++++---------------------------------------- 2 files changed, 2572 insertions(+), 5131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2de10c4a4244c612674d7…

1 0

Alexandre Julliard : makefiles: Use AS_MKDIR_P to create the extra directories.
by Alexandre Julliard 12 Feb '10

12 Feb '10

Module: wine Branch: master Commit: a1c253e0568c5ea343af47507e77eadaef192a4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1c253e0568c5ea343af47507… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 11 20:26:35 2010 +0100 makefiles: Use AS_MKDIR_P to create the extra directories. --- aclocal.m4 | 2 +- configure | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index dba0ab3..a70fd30 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -140,7 +140,7 @@ dnl dnl Usage: WINE_CONFIG_EXTRA_DIR(dirname) dnl AC_DEFUN([WINE_CONFIG_EXTRA_DIR], -[AC_CONFIG_COMMANDS([$1],[test -d "$1" || (AC_MSG_NOTICE([creating $1]) && mkdir "$1")])]) +[AC_CONFIG_COMMANDS([$1],[test -d "$1" || { AC_MSG_NOTICE([creating $1]); AS_MKDIR_P("$1"); }])]) dnl **** Create symlinks from config.status **** dnl diff --git a/configure b/configure index ec2199d..3bbc4a7 100755 --- a/configure +++ b/configure @@ -23319,18 +23319,18 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in "include/stamp-h":C) echo timestamp > include/stamp-h ;; - "dlls/gdi32/enhmfdrv":C) test -d "dlls/gdi32/enhmfdrv" || ({ $as_echo "$as_me:${as_lineno-$LINENO}: creating dlls/gdi32/enhmfdrv" >&5 -$as_echo "$as_me: creating dlls/gdi32/enhmfdrv" >&6;} && mkdir "dlls/gdi32/enhmfdrv") ;; - "dlls/gdi32/mfdrv":C) test -d "dlls/gdi32/mfdrv" || ({ $as_echo "$as_me:${as_lineno-$LINENO}: creating dlls/gdi32/mfdrv" >&5 -$as_echo "$as_me: creating dlls/gdi32/mfdrv" >&6;} && mkdir "dlls/gdi32/mfdrv") ;; - "dlls/kernel32/nls":C) test -d "dlls/kernel32/nls" || ({ $as_echo "$as_me:${as_lineno-$LINENO}: creating dlls/kernel32/nls" >&5 -$as_echo "$as_me: creating dlls/kernel32/nls" >&6;} && mkdir "dlls/kernel32/nls") ;; - "dlls/user32/resources":C) test -d "dlls/user32/resources" || ({ $as_echo "$as_me:${as_lineno-$LINENO}: creating dlls/user32/resources" >&5 -$as_echo "$as_me: creating dlls/user32/resources" >&6;} && mkdir "dlls/user32/resources") ;; - "dlls/wineps.drv/data":C) test -d "dlls/wineps.drv/data" || ({ $as_echo "$as_me:${as_lineno-$LINENO}: creating dlls/wineps.drv/data" >&5 -$as_echo "$as_me: creating dlls/wineps.drv/data" >&6;} && mkdir "dlls/wineps.drv/data") ;; - "include/wine":C) test -d "include/wine" || ({ $as_echo "$as_me:${as_lineno-$LINENO}: creating include/wine" >&5 -$as_echo "$as_me: creating include/wine" >&6;} && mkdir "include/wine") ;; + "dlls/gdi32/enhmfdrv":C) test -d "dlls/gdi32/enhmfdrv" || { { $as_echo "$as_me:${as_lineno-$LINENO}: creating dlls/gdi32/enhmfdrv" >&5 +$as_echo "$as_me: creating dlls/gdi32/enhmfdrv" >&6;}; as_dir="dlls/gdi32/enhmfdrv"; as_fn_mkdir_p; } ;; + "dlls/gdi32/mfdrv":C) test -d "dlls/gdi32/mfdrv" || { { $as_echo "$as_me:${as_lineno-$LINENO}: creating dlls/gdi32/mfdrv" >&5 +$as_echo "$as_me: creating dlls/gdi32/mfdrv" >&6;}; as_dir="dlls/gdi32/mfdrv"; as_fn_mkdir_p; } ;; + "dlls/kernel32/nls":C) test -d "dlls/kernel32/nls" || { { $as_echo "$as_me:${as_lineno-$LINENO}: creating dlls/kernel32/nls" >&5 +$as_echo "$as_me: creating dlls/kernel32/nls" >&6;}; as_dir="dlls/kernel32/nls"; as_fn_mkdir_p; } ;; + "dlls/user32/resources":C) test -d "dlls/user32/resources" || { { $as_echo "$as_me:${as_lineno-$LINENO}: creating dlls/user32/resources" >&5 +$as_echo "$as_me: creating dlls/user32/resources" >&6;}; as_dir="dlls/user32/resources"; as_fn_mkdir_p; } ;; + "dlls/wineps.drv/data":C) test -d "dlls/wineps.drv/data" || { { $as_echo "$as_me:${as_lineno-$LINENO}: creating dlls/wineps.drv/data" >&5 +$as_echo "$as_me: creating dlls/wineps.drv/data" >&6;}; as_dir="dlls/wineps.drv/data"; as_fn_mkdir_p; } ;; + "include/wine":C) test -d "include/wine" || { { $as_echo "$as_me:${as_lineno-$LINENO}: creating include/wine" >&5 +$as_echo "$as_me: creating include/wine" >&6;}; as_dir="include/wine"; as_fn_mkdir_p; } ;; esac done # for ac_tag

1 0

Alexandre Julliard : makefiles: Use AS_VAR_APPEND to build the list of warning messages.
by Alexandre Julliard 12 Feb '10

12 Feb '10

Module: wine Branch: master Commit: 0dc503bcf1d1ca5e0e6cd52476f17fa53fc5527b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dc503bcf1d1ca5e0e6cd5247… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 11 20:25:47 2010 +0100 makefiles: Use AS_VAR_APPEND to build the list of warning messages. --- aclocal.m4 | 4 +- configure | 68 ++++++++++++++++++++++++++++++------------------------------ 2 files changed, 36 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0dc503bcf1d1ca5e0e6cd…

1 0

Alexandre Julliard : makefiles: Fix the installation rules for programs bin directory.
by Alexandre Julliard 12 Feb '10

12 Feb '10

Module: wine Branch: master Commit: e85bf5c190d97ed117ad28dcfeeebb783a5d5cfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e85bf5c190d97ed117ad28dcf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 11 20:07:39 2010 +0100 makefiles: Fix the installation rules for programs bin directory. --- programs/Makefile.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/Makefile.in b/programs/Makefile.in index f6b7499..9946998 100644 --- a/programs/Makefile.in +++ b/programs/Makefile.in @@ -3,7 +3,8 @@ TOPOBJDIR = .. SRCDIR = @srcdir@ VPATH = @srcdir@ -INSTALLPROGS = @ALL_PROGRAM_BIN_INSTALL_DIRS@ +ALL_INSTALLS = @ALL_PROGRAM_BIN_INSTALL_DIRS@ +INSTALLPROGS = $(ALL_INSTALLS:programs/%=%) INSTALLDIRS = $(DESTDIR)$(bindir)

1 0

Alexandre Julliard : patches: Improve filtering of non-git patches that only add new files.
by Alexandre Julliard 12 Feb '10

12 Feb '10

Module: tools Branch: master Commit: 68935fce5551c6e75b2839afb2c8ddbd3da66afa URL: http://source.winehq.org/git/tools.git/?a=commit;h=68935fce5551c6e75b2839af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 12 17:15:14 2010 +0100 patches: Improve filtering of non-git patches that only add new files. --- patches/filter | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/patches/filter b/patches/filter index 747f719..8a9bf9c 100755 --- a/patches/filter +++ b/patches/filter @@ -40,6 +40,7 @@ sub find_p_option(@) while ($a[$ret] ne $b[$ret]) { $ret++; } return $ret; } + return 0; } sub add_prefix($$$) @@ -66,6 +67,7 @@ sub filter_patch(@) if (/^Index: (\S*)/) { $use_index = 1; } elsif (/^\+\+\+ b\//) { $p_option = 1; } elsif (/^diff --git/) { $p_option = 1; } + elsif (/ (\/dev\/null)/) { push @diff_lines, $1; } elsif (/^--- (\S*)\//) { push @diff_lines, $1; } elsif (/^\+\+\+ (\S*)\//) { push @diff_lines, $1; } }

1 0

Alexandre Julliard : winetest: Fix building of the tests for the new makefiles architecture.
by Alexandre Julliard 11 Feb '10

11 Feb '10

Module: tools Branch: master Commit: c2f5792fae30cb14105f51b3d44af2c7a6d76e9a URL: http://source.winehq.org/git/tools.git/?a=commit;h=c2f5792fae30cb14105f51b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 10 18:03:12 2010 +0100 winetest: Fix building of the tests for the new makefiles architecture. --- winetest/make-winetest | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/winetest/make-winetest b/winetest/make-winetest index 6e4b24c..813cfb5 100755 --- a/winetest/make-winetest +++ b/winetest/make-winetest @@ -79,7 +79,7 @@ umask 022 cd build-native && ../wine/configure --enable-win64 --without-x --without-freetype) || exit - (cd build-native && make depend && make tools) || exit + (cd build-native && make depend && make __tooldeps__) || exit # then cross-compile the tests @@ -90,8 +90,7 @@ umask 022 (cd build-mingw && make depend && - make include && - make -C dlls testsubdirs && + make programs/winetest && cd programs/winetest && $mingw32-gcc -v 2> build.nfo && make dist) || exit @@ -116,8 +115,7 @@ umask 022 (cd build-mingw64 && make depend && - make include && - make -C dlls testsubdirs && + make programs/winetest && cd programs/winetest && $mingw64-gcc -v 2> build.nfo && make dist) || exit

1 0

Huw Davies : rpcrt4: Add tests for multi-dimensional conformant arrays.
by Alexandre Julliard 11 Feb '10

11 Feb '10

Module: wine Branch: master Commit: 6805045b05c80a76efa5f0aad0b6aafd6adf92ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=6805045b05c80a76efa5f0aad… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 11 16:18:55 2010 +0000 rpcrt4: Add tests for multi-dimensional conformant arrays. --- dlls/rpcrt4/tests/ndr_marshall.c | 156 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 156 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 15ccbef..be8e638 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1882,6 +1882,161 @@ static void test_conf_complex_struct(void) HeapFree(GetProcessHeap(), 0, memsrc); } + +static void test_conf_complex_array(void) +{ + RPC_MESSAGE RpcMessage; + MIDL_STUB_MESSAGE StubMsg; + MIDL_STUB_DESC StubDesc; + void *ptr; + unsigned int i, j; + struct conf_complex + { + unsigned int dim1, dim2; + DWORD **array; + }; + struct conf_complex memsrc; + struct conf_complex *mem; + DWORD *buf, expected_length; + + static const unsigned char fmtstr_complex_array[] = + { + +/* 0 */ 0x21, /* FC_BOGUS_ARRAY */ + 0x3, /* 3 */ +/* 2 */ NdrFcShort( 0x0 ), /* 0 */ +/* 4 */ 0x19, 0x0, /* Corr desc: field pointer, FC_ULONG */ +/* 6 */ NdrFcShort( 0x4 ), /* 4 */ +/* 8 */ NdrFcLong( 0xffffffff ), /* -1 */ +/* 12 */ 0x8, /* FC_LONG */ + 0x5b, /* FC_END */ +/* 14 */ + 0x21, /* FC_BOGUS_ARRAY */ + 0x3, /* 3 */ +/* 16 */ NdrFcShort( 0x0 ), /* 0 */ +/* 18 */ 0x19, /* Corr desc: field pointer, FC_ULONG */ + 0x0, /* */ +/* 20 */ NdrFcShort( 0x0 ), /* 0 */ +/* 22 */ NdrFcLong( 0xffffffff ), /* -1 */ +/* 26 */ 0x12, 0x0, /* FC_UP */ +/* 28 */ NdrFcShort( 0xffe4 ), /* Offset= -28 (0) */ +/* 30 */ 0x5c, /* FC_PAD */ + 0x5b, /* FC_END */ +/* 32 */ + 0x16, /* FC_PSTRUCT */ + 0x3, /* 3 */ +/* 34 */ NdrFcShort( 0xc ), /* 12 */ +/* 36 */ 0x4b, /* FC_PP */ + 0x5c, /* FC_PAD */ +/* 38 */ 0x46, /* FC_NO_REPEAT */ + 0x5c, /* FC_PAD */ +/* 40 */ NdrFcShort( 0x8 ), /* 8 */ +/* 42 */ NdrFcShort( 0x8 ), /* 8 */ +/* 44 */ 0x12, 0x0, /* FC_UP */ +/* 46 */ NdrFcShort( 0xffe0 ), /* Offset= -32 (14) */ +/* 48 */ 0x5b, /* FC_END */ + 0x8, /* FC_LONG */ +/* 50 */ 0x8, /* FC_LONG */ + 0x8, /* FC_LONG */ +/* 52 */ 0x5c, /* FC_PAD */ + 0x5b, /* FC_END */ + }; + + memsrc.dim1 = 5; + memsrc.dim2 = 3; + + memsrc.array = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, memsrc.dim1 * sizeof(DWORD*)); + + for(i = 0; i < memsrc.dim1; i++) + { + memsrc.array[i] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, memsrc.dim2 * sizeof(DWORD)); + for(j = 0; j < memsrc.dim2; j++) + memsrc.array[i][j] = i * memsrc.dim2 + j; + } + + StubDesc = Object_StubDesc; + StubDesc.pFormatTypes = fmtstr_complex_array; + + NdrClientInitializeNew( + &RpcMessage, + &StubMsg, + &StubDesc, + 0); + + StubMsg.BufferLength = 0; + NdrSimpleStructBufferSize( &StubMsg, + (unsigned char *)&memsrc, + &fmtstr_complex_array[32] ); + + expected_length = (4 + memsrc.dim1 * (2 + memsrc.dim2)) * 4; +todo_wine + ok(StubMsg.BufferLength >= expected_length, "length %d\n", StubMsg.BufferLength); + + /*NdrGetBuffer(&_StubMsg, _StubMsg.BufferLength, NULL);*/ + StubMsg.RpcMsg->Buffer = StubMsg.BufferStart = StubMsg.Buffer = HeapAlloc(GetProcessHeap(), 0, StubMsg.BufferLength); + StubMsg.BufferEnd = StubMsg.BufferStart + StubMsg.BufferLength; + + ptr = NdrSimpleStructMarshall( &StubMsg, (unsigned char *)&memsrc, + &fmtstr_complex_array[32] ); + ok(ptr == NULL, "ret %p\n", ptr); + +todo_wine + ok((char*)StubMsg.Buffer == (char*)StubMsg.BufferStart + expected_length, "not at expected length\n"); + + /* Skip tests on Wine until the todo_wine is removed */ + if((char*)StubMsg.Buffer == (char*)StubMsg.BufferStart + expected_length) + { + + buf = (DWORD *)StubMsg.BufferStart; + + ok(*buf == memsrc.dim1, "dim1 should have been %d instead of %08x\n", memsrc.dim1, *buf); + buf++; + ok(*buf == memsrc.dim2, "dim2 should have been %d instead of %08x\n", memsrc.dim2, *buf); + buf++; + ok(*buf != 0, "pointer id should be non-zero\n"); + buf++; + ok(*buf == memsrc.dim1, "Conformance should have been %d instead of %08x\n", memsrc.dim1, *buf); + buf++; + for(i = 0; i < memsrc.dim1; i++) + { + ok(*buf != 0, "pointer id[%d] should be non-zero\n", i); + buf++; + } + for(i = 0; i < memsrc.dim1; i++) + { + ok(*buf == memsrc.dim2, "Conformance should have been %d instead of %08x\n", memsrc.dim2, *buf); + buf++; + for(j = 0; j < memsrc.dim2; j++) + { + ok(*buf == i * memsrc.dim2 + j, "got %08x\n", *buf); + buf++; + } + } + + ok((void*)buf == StubMsg.Buffer, "not at end of buffer\n"); + + /* Server */ + my_alloc_called = 0; + StubMsg.IsClient = 0; + mem = NULL; + StubMsg.Buffer = StubMsg.BufferStart; + ptr = NdrSimpleStructUnmarshall( &StubMsg, (unsigned char **)&mem, &fmtstr_complex_array[32], 0); + ok(ptr == NULL, "ret %p\n", ptr); + ok(mem->dim1 == memsrc.dim1, "mem->dim1 wasn't unmarshalled correctly (%d)\n", mem->dim1); + ok(mem->dim2 == memsrc.dim2, "mem->dim2 wasn't unmarshalled correctly (%d)\n", mem->dim2); + ok(mem->array[1][0] == memsrc.dim2, "mem->array[1][0] wasn't unmarshalled correctly (%d)\n", mem->array[1][0]); + + StubMsg.Buffer = StubMsg.BufferStart; + NdrSimpleStructFree( &StubMsg, (unsigned char*)mem, &fmtstr_complex_array[32]); + } + + HeapFree(GetProcessHeap(), 0, StubMsg.RpcMsg->Buffer); + + for(i = 0; i < memsrc.dim1; i++) + HeapFree(GetProcessHeap(), 0, memsrc.array[i]); + HeapFree(GetProcessHeap(), 0, memsrc.array); +} + static void test_ndr_buffer(void) { static unsigned char ncalrpc[] = "ncalrpc"; @@ -2226,6 +2381,7 @@ START_TEST( ndr_marshall ) test_conformant_string(); test_nonconformant_string(); test_conf_complex_struct(); + test_conf_complex_array(); test_ndr_buffer(); test_NdrMapCommAndFaultStatus(); test_NdrGetUserMarshalInfo();

1 0

Michael Stefaniuc : user32: Don't use HIWORD() on a HINSTANCE.
by Alexandre Julliard 11 Feb '10

11 Feb '10

Module: wine Branch: master Commit: 7442a7f9311b7d0adb5737d6676a6be94e41bf5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7442a7f9311b7d0adb5737d66… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Feb 11 15:26:23 2010 +0100 user32: Don't use HIWORD() on a HINSTANCE. --- dlls/user32/cursoricon.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index d4cdde4..a003cb0 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1258,7 +1258,7 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, if (!hInstance) hInstance = user32_module; /* Load OEM cursor/icon */ /* don't cache 16-bit instances (FIXME: should never get 16-bit instances in the first place) */ - if (!HIWORD( hInstance )) loadflags &= ~LR_SHARED; + if ((ULONG_PTR)hInstance >> 16 == 0) loadflags &= ~LR_SHARED; /* Get directory resource ID */

1 0

Hans Leidekker : msi: Add tests for installing and removing ODBC drivers.
by Alexandre Julliard 11 Feb '10

11 Feb '10

Module: wine Branch: master Commit: bbfaf6af75afe41d16e24dcc49a0c7881a598be0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbfaf6af75afe41d16e24dcc4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 11 13:14:06 2010 +0100 msi: Add tests for installing and removing ODBC drivers. --- dlls/msi/tests/install.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 103 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 0f7dd45..96b5117 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1260,6 +1260,66 @@ static const CHAR vp_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "InstallFiles\t\t4000\n" "InstallFinalize\t\t6000\n"; +static const CHAR odbc_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "ODBCdriver.dll\todbc\tODBCdriver.dll\t1000\t\t\t8192\t1\n" + "ODBCdriver2.dll\todbc\tODBCdriver2.dll\t1000\t\t\t8192\t2\n" + "ODBCtranslator.dll\todbc\tODBCtranslator.dll\t1000\t\t\t8192\t3\n" + "ODBCtranslator2.dll\todbc\tODBCtranslator2.dll\t1000\t\t\t8192\t4\n" + "ODBCsetup.dll\todbc\tODBCsetup.dll\t1000\t\t\t8192\t5\n"; + +static const CHAR odbc_feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "odbc\t\t\todbc feature\t1\t2\tMSITESTDIR\t0\n"; + +static const CHAR odbc_feature_comp_dat[] = "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "odbc\todbc\n"; + +static const CHAR odbc_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "odbc\t{B6F3E4AE-35D1-4B72-9044-989F03E20A43}\tMSITESTDIR\t0\t\tODBCdriver.dll\n"; + +static const CHAR odbc_driver_dat[] = "Driver\tComponent_\tDescription\tFile_\tFile_Setup\n" + "s72\ts72\ts255\ts72\tS72\n" + "ODBCDriver\tDriver\n" + "ODBC test driver\todbc\tODBC test driver\tODBCdriver.dll\t\n" + "ODBC test driver2\todbc\tODBC test driver2\tODBCdriver2.dll\tODBCsetup.dll\n"; + +static const CHAR odbc_translator_dat[] = "Translator\tComponent_\tDescription\tFile_\tFile_Setup\n" + "s72\ts72\ts255\ts72\tS72\n" + "ODBCTranslator\tTranslator\n" + "ODBC test translator\todbc\tODBC test translator\tODBCtranslator.dll\t\n" + "ODBC test translator2\todbc\tODBC test translator2\tODBCtranslator2.dll\tODBCsetup.dll\n"; + +static const CHAR odbc_datasource_dat[] = "DataSource\tComponent_\tDescription\tDriverDescription\tRegistration\n" + "s72\ts72\ts255\ts255\ti2\n" + "ODBCDataSource\tDataSource\n" + "ODBC data source\todbc\tODBC data source\tODBC driver\t0\n"; + +static const CHAR odbc_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "LaunchConditions\t\t100\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "CostFinalize\t\t1000\n" + "InstallValidate\t\t1400\n" + "InstallInitialize\t\t1500\n" + "InstallODBC\t\t3000\n" + "RemoveODBC\t\t3100\n" + "InstallFiles\t\t4000\n" + "InstallFinalize\t\t6000\n"; + +static const CHAR odbc_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" + "i2\ti4\tL64\tS255\tS32\tS72\n" + "Media\tDiskId\n" + "1\t5\t\t\tDISK1\t\n"; + typedef struct _msi_table { const CHAR *filename; @@ -2056,6 +2116,21 @@ static const msi_table vp_tables[] = ADD_TABLE(vp_property) }; +static const msi_table odbc_tables[] = +{ + ADD_TABLE(odbc_component), + ADD_TABLE(directory), + ADD_TABLE(odbc_feature), + ADD_TABLE(odbc_feature_comp), + ADD_TABLE(odbc_file), + ADD_TABLE(odbc_driver), + ADD_TABLE(odbc_translator), + ADD_TABLE(odbc_datasource), + ADD_TABLE(odbc_install_exec_seq), + ADD_TABLE(odbc_media), + ADD_TABLE(property) +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -7920,6 +7995,33 @@ static void test_validate_product_id(void) delete_test_files(); } +static void test_install_remove_odbc(void) +{ + UINT r; + + create_test_files(); + create_file("msitest\\ODBCdriver.dll", 1000); + create_file("msitest\\ODBCdriver2.dll", 1000); + create_file("msitest\\ODBCtranslator.dll", 1000); + create_file("msitest\\ODBCtranslator2.dll", 1000); + create_file("msitest\\ODBCsetup.dll", 1000); + create_database(msifile, odbc_tables, sizeof(odbc_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(delete_pf("msitest\\ODBCdriver.dll", TRUE), "file not created\n"); + ok(delete_pf("msitest\\ODBCdriver2.dll", TRUE), "file not created\n"); + ok(delete_pf("msitest\\ODBCtranslator.dll", TRUE), "file not created\n"); + ok(delete_pf("msitest\\ODBCtranslator2.dll", TRUE), "file not created\n"); + ok(delete_pf("msitest\\ODBCsetup.dll", TRUE), "file not created\n"); + ok(delete_pf("msitest", FALSE), "directory not created\n"); + + delete_test_files(); +} + START_TEST(install) { DWORD len; @@ -8018,6 +8120,7 @@ START_TEST(install) test_self_registration(); test_register_font(); test_validate_product_id(); + test_install_remove_odbc(); DeleteFileA(log_file);

1 0

Hans Leidekker : msi: Implement the RemoveODBC standard action.
by Alexandre Julliard 11 Feb '10

11 Feb '10

Module: wine Branch: master Commit: 28bf8e1f0db2268ee3f8aa98497e06ea7e949f90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28bf8e1f0db2268ee3f8aa984… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 11 13:13:41 2010 +0100 msi: Implement the RemoveODBC standard action. --- dlls/msi/action.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 114 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index b949fc7..31870bd 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5086,6 +5086,120 @@ static UINT ACTION_InstallODBC( MSIPACKAGE *package ) return rc; } +static UINT ITERATE_RemoveODBCDriver( MSIRECORD *rec, LPVOID param ) +{ + DWORD usage; + LPCWSTR desc; + + desc = MSI_RecordGetString( rec, 3 ); + if (!SQLRemoveDriverW( desc, FALSE, &usage )) + { + WARN("Failed to remove ODBC driver\n"); + } + else if (!usage) + { + FIXME("Usage count reached 0\n"); + } + + return ERROR_SUCCESS; +} + +static UINT ITERATE_RemoveODBCTranslator( MSIRECORD *rec, LPVOID param ) +{ + DWORD usage; + LPCWSTR desc; + + desc = MSI_RecordGetString( rec, 3 ); + if (!SQLRemoveTranslatorW( desc, &usage )) + { + WARN("Failed to remove ODBC translator\n"); + } + else if (!usage) + { + FIXME("Usage count reached 0\n"); + } + + return ERROR_SUCCESS; +} + +static UINT ITERATE_RemoveODBCDataSource( MSIRECORD *rec, LPVOID param ) +{ + LPWSTR attrs; + LPCWSTR desc, driver; + WORD request = ODBC_REMOVE_SYS_DSN; + INT registration; + DWORD len; + + static const WCHAR attrs_fmt[] = { + 'D','S','N','=','%','s',0 }; + + desc = MSI_RecordGetString( rec, 3 ); + driver = MSI_RecordGetString( rec, 4 ); + registration = MSI_RecordGetInteger( rec, 5 ); + + if (registration == msidbODBCDataSourceRegistrationPerMachine) request = ODBC_REMOVE_SYS_DSN; + else if (registration == msidbODBCDataSourceRegistrationPerUser) request = ODBC_REMOVE_DSN; + + len = strlenW( attrs_fmt ) + strlenW( desc ) + 1 + 1; + attrs = msi_alloc( len * sizeof(WCHAR) ); + if (!attrs) + return ERROR_OUTOFMEMORY; + + FIXME("Use ODBCSourceAttribute table\n"); + + len = sprintfW( attrs, attrs_fmt, desc ); + attrs[len + 1] = 0; + + if (!SQLConfigDataSourceW( NULL, request, driver, attrs )) + { + WARN("Failed to remove ODBC data source\n"); + } + msi_free( attrs ); + + return ERROR_SUCCESS; +} + +static UINT ACTION_RemoveODBC( MSIPACKAGE *package ) +{ + UINT rc; + MSIQUERY *view; + + static const WCHAR driver_query[] = { + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + 'O','D','B','C','D','r','i','v','e','r',0 }; + + static const WCHAR translator_query[] = { + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + 'O','D','B','C','T','r','a','n','s','l','a','t','o','r',0 }; + + static const WCHAR source_query[] = { + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + 'O','D','B','C','D','a','t','a','S','o','u','r','c','e',0 }; + + rc = MSI_DatabaseOpenViewW( package->db, driver_query, &view ); + if (rc != ERROR_SUCCESS) + return ERROR_SUCCESS; + + rc = MSI_IterateRecords( view, NULL, ITERATE_RemoveODBCDriver, package ); + msiobj_release( &view->hdr ); + + rc = MSI_DatabaseOpenViewW( package->db, translator_query, &view ); + if (rc != ERROR_SUCCESS) + return ERROR_SUCCESS; + + rc = MSI_IterateRecords( view, NULL, ITERATE_RemoveODBCTranslator, package ); + msiobj_release( &view->hdr ); + + rc = MSI_DatabaseOpenViewW( package->db, source_query, &view ); + if (rc != ERROR_SUCCESS) + return ERROR_SUCCESS; + + rc = MSI_IterateRecords( view, NULL, ITERATE_RemoveODBCDataSource, package ); + msiobj_release( &view->hdr ); + + return rc; +} + #define ENV_ACT_SETALWAYS 0x1 #define ENV_ACT_SETABSENT 0x2 #define ENV_ACT_REMOVE 0x4 @@ -6290,12 +6404,6 @@ static UINT ACTION_RemoveExistingProducts( MSIPACKAGE *package ) return msi_unimplemented_action_stub( package, "RemoveExistingProducts", table ); } -static UINT ACTION_RemoveODBC( MSIPACKAGE *package ) -{ - static const WCHAR table[] = { 'O','D','B','C','D','r','i','v','e','r',0 }; - return msi_unimplemented_action_stub( package, "RemoveODBC", table ); -} - static UINT ACTION_RemoveRegistryValues( MSIPACKAGE *package ) { static const WCHAR table[] = { 'R','e','m','o','v','e','R','e','g','i','s','t','r','y',0 };

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2010