April 2007 - Wine-commits - list.winehq.org

Alexandre Julliard : configure: Use AC_SEARCH_LIBS for the Solaris libs to avoid unused function checks.
by Alexandre Julliard 23 Apr '07

23 Apr '07

Module: wine Branch: master Commit: 2871041910b5f0100820a7d4e9335cf0633a6d44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2871041910b5f0100820a7d4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 23 16:31:58 2007 +0200 configure: Use AC_SEARCH_LIBS for the Solaris libs to avoid unused function checks. --- configure | 161 +++++++++++++++++++++++++++++---------------------- configure.ac | 18 +----- include/config.h.in | 18 ------ 3 files changed, 94 insertions(+), 103 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2871041910b5f0100820a…

1 0

Stefan Leichter : advapi32: More tests for RegDeleteTreeA.
by Alexandre Julliard 23 Apr '07

23 Apr '07

Module: wine Branch: master Commit: 2c99d4b2a7c282a63bf023b0cdf14ae842ec6124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c99d4b2a7c282a63bf023b0c… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun Apr 22 22:28:20 2007 +0200 advapi32: More tests for RegDeleteTreeA. --- dlls/advapi32/tests/registry.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index cf581d7..9d73633 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1151,15 +1151,33 @@ static void test_reg_delete_tree(void) ok(!RegQueryValueA(subkey, NULL, buffer, &size), "Default value of subkey not longer present\n"); + ret = RegCreateKeyA(subkey, "subkey2", &subkey2); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegCloseKey(subkey2); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegCreateKeyA(subkey, "subkey3", &subkey2); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegCloseKey(subkey2); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegSetValueA(subkey, "value", REG_SZ, "data2", 5); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); ret = pRegDeleteTreeA(subkey, NULL); ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); ok(!RegOpenKeyA(hkey_main, "subkey", &subkey), "subkey was deleted\n"); + ok(RegOpenKeyA(subkey, "subkey2", &subkey2), + "subkey2 was not deleted\n"); + ok(RegOpenKeyA(subkey, "subkey3", &subkey2), + "subkey3 was not deleted\n"); + size = MAX_PATH; ret = RegQueryValueA(subkey, NULL, buffer, &size); ok(ret == ERROR_SUCCESS, "Default value of subkey is not present\n"); ok(!lstrlenA(buffer), "Expected length 0 got length %u(%s)\n", lstrlenA(buffer), buffer); + size = MAX_PATH; + ok(RegQueryValueA(subkey, "value", buffer, &size), + "Value is still present\n"); ret = pRegDeleteTreeA(hkey_main, "not-here"); ok(ret == ERROR_FILE_NOT_FOUND,

1 0

Andrew Talbot : activeds: Exclude unused headers.
by Alexandre Julliard 23 Apr '07

23 Apr '07

Module: wine Branch: master Commit: 3660ed87b515d14618d4c62bdb7eaa0f3bba78c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3660ed87b515d14618d4c62bd… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Apr 21 21:44:50 2007 +0100 activeds: Exclude unused headers. --- dlls/activeds/activeds_main.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index ba829d1..9c03ac1 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -29,9 +29,6 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winreg.h" -#include "winver.h" -#include "winnls.h" #include "objbase.h" #include "iads.h"

1 0

Andrew Talbot : acledit: Exclude unused headers.
by Alexandre Julliard 23 Apr '07

23 Apr '07

Module: wine Branch: master Commit: cc90c9afd36745fa71849278bb4daa65c1fbd8c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc90c9afd36745fa71849278b… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Apr 21 21:43:48 2007 +0100 acledit: Exclude unused headers. --- dlls/acledit/main.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/acledit/main.c b/dlls/acledit/main.c index ca6836a..7dd374c 100644 --- a/dlls/acledit/main.c +++ b/dlls/acledit/main.c @@ -23,9 +23,6 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winreg.h" -#include "winver.h" -#include "winnls.h" #include "wine/unicode.h" #include "wine/debug.h"

1 0

Andrew Talbot : advpack: Exclude unused headers.
by Alexandre Julliard 23 Apr '07

23 Apr '07

Module: wine Branch: master Commit: 924e1d4bc3da6b77cf695b2a1106b5d72ab3a35b URL: http://source.winehq.org/git/wine.git/?a=commit;h=924e1d4bc3da6b77cf695b2a1… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Apr 21 21:52:03 2007 +0100 advpack: Exclude unused headers. --- dlls/advpack/advpack.c | 1 - dlls/advpack/install.c | 1 - dlls/advpack/reg.c | 1 - 3 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 45db5b1..ee3a87e 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -25,7 +25,6 @@ #include "winbase.h" #include "winuser.h" #include "winreg.h" -#include "winver.h" #include "winternl.h" #include "winnls.h" #include "setupapi.h" diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index e2e55ea..b7e997c 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -25,7 +25,6 @@ #include "winbase.h" #include "winuser.h" #include "winreg.h" -#include "winver.h" #include "winternl.h" #include "winnls.h" #include "setupapi.h" diff --git a/dlls/advpack/reg.c b/dlls/advpack/reg.c index f456f2c..2b1418a 100644 --- a/dlls/advpack/reg.c +++ b/dlls/advpack/reg.c @@ -25,7 +25,6 @@ #include "winerror.h" #include "winuser.h" #include "winternl.h" -#include "setupapi.h" #include "advpub.h" #include "wine/unicode.h" #include "wine/debug.h"

1 0

Andrew Talbot : avicap32: Exclude unused header.
by Alexandre Julliard 23 Apr '07

23 Apr '07

Module: wine Branch: master Commit: 80bf297ad71feb9c10d10f0bfb8f84c330e54a65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80bf297ad71feb9c10d10f0bf… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Apr 21 21:53:17 2007 +0100 avicap32: Exclude unused header. --- dlls/avicap32/avicap32_main.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/avicap32/avicap32_main.c b/dlls/avicap32/avicap32_main.c index 41d790e..4fc6727 100644 --- a/dlls/avicap32/avicap32_main.c +++ b/dlls/avicap32/avicap32_main.c @@ -50,7 +50,6 @@ #include "wingdi.h" #include "winuser.h" #include "vfw.h" -#include "winreg.h" #include "winnls.h" #include "winternl.h" #include "wine/debug.h"

1 0

EA Durbin : sxs: Add new dll stub.
by Alexandre Julliard 23 Apr '07

23 Apr '07

Module: wine Branch: master Commit: 74977dae4538a9250b698d88f05c51dbde608981 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74977dae4538a9250b698d88f… Author: EA Durbin <ead1234(a)hotmail.com> Date: Thu Apr 19 18:28:52 2007 -0500 sxs: Add new dll stub. --- Makefile.in | 2 ++ configure | 3 +++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/sxs/Makefile.in | 13 +++++++++++++ dlls/sxs/sxs.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/sxs/sxs.spec | 2 ++ 7 files changed, 67 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index 541ff0d..565871c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -369,6 +369,7 @@ ALL_MAKEFILES = \ dlls/sti/Makefile \ dlls/strmiids/Makefile \ dlls/svrapi/Makefile \ + dlls/sxs/Makefile \ dlls/tapi32/Makefile \ dlls/twain_32/Makefile \ dlls/unicows/Makefile \ @@ -711,6 +712,7 @@ dlls/stdole32.tlb/Makefile: dlls/stdole32.tlb/Makefile.in dlls/Makedll.rules dlls/sti/Makefile: dlls/sti/Makefile.in dlls/Makedll.rules dlls/strmiids/Makefile: dlls/strmiids/Makefile.in dlls/Makeimplib.rules dlls/svrapi/Makefile: dlls/svrapi/Makefile.in dlls/Makedll.rules +dlls/sxs/Makefile: dlls/sxs/Makefile.in dlls/Makedll.rules dlls/tapi32/Makefile: dlls/tapi32/Makefile.in dlls/Makedll.rules dlls/twain_32/Makefile: dlls/twain_32/Makefile.in dlls/Makedll.rules dlls/unicows/Makefile: dlls/unicows/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index e086a93..e0790fc 100755 --- a/configure +++ b/configure @@ -20627,6 +20627,8 @@ ac_config_files="$ac_config_files dlls/strmiids/Makefile" ac_config_files="$ac_config_files dlls/svrapi/Makefile" +ac_config_files="$ac_config_files dlls/sxs/Makefile" + ac_config_files="$ac_config_files dlls/tapi32/Makefile" ac_config_files="$ac_config_files dlls/twain_32/Makefile" @@ -21636,6 +21638,7 @@ do "dlls/sti/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sti/Makefile" ;; "dlls/strmiids/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/strmiids/Makefile" ;; "dlls/svrapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/svrapi/Makefile" ;; + "dlls/sxs/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sxs/Makefile" ;; "dlls/tapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/tapi32/Makefile" ;; "dlls/twain_32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/twain_32/Makefile" ;; "dlls/unicows/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/unicows/Makefile" ;; diff --git a/configure.ac b/configure.ac index 5f718c7..6fd21b4 100644 --- a/configure.ac +++ b/configure.ac @@ -1704,6 +1704,7 @@ AC_CONFIG_FILES([dlls/stdole32.tlb/Makefile]) AC_CONFIG_FILES([dlls/sti/Makefile]) AC_CONFIG_FILES([dlls/strmiids/Makefile]) AC_CONFIG_FILES([dlls/svrapi/Makefile]) +AC_CONFIG_FILES([dlls/sxs/Makefile]) AC_CONFIG_FILES([dlls/tapi32/Makefile]) AC_CONFIG_FILES([dlls/twain_32/Makefile]) AC_CONFIG_FILES([dlls/unicows/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 7ec5711..6594762 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -171,6 +171,7 @@ BASEDIRS = \ stdole32.tlb \ sti \ svrapi \ + sxs \ tapi32 \ twain_32 \ unicows \ diff --git a/dlls/sxs/Makefile.in b/dlls/sxs/Makefile.in new file mode 100644 index 0000000..da028e4 --- /dev/null +++ b/dlls/sxs/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = sxs.dll +IMPORTS = kernel32 + +C_SRCS = \ + sxs.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/sxs/sxs.c b/dlls/sxs/sxs.c new file mode 100644 index 0000000..cd64de5 --- /dev/null +++ b/dlls/sxs/sxs.c @@ -0,0 +1,45 @@ +/* + * sxs main + * + * Copyright 2007 EA Durbin + * + * 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 + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(sxs); + + +/*********************************************************************** + * DllMain (SXS.@) + * + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinstDLL ); + break; + } + return TRUE; +} diff --git a/dlls/sxs/sxs.spec b/dlls/sxs/sxs.spec new file mode 100644 index 0000000..012d06b --- /dev/null +++ b/dlls/sxs/sxs.spec @@ -0,0 +1,2 @@ +@ stub CreateAssemblyCache +@ stub CreateAssemblyNameObject

1 0

Yuval Fledel : include: Introduce ntsecpkg.h.
by Alexandre Julliard 23 Apr '07

23 Apr '07

Module: wine Branch: master Commit: 4d7d6e96a0a2b52ce185d90679661ffb3582f648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d7d6e96a0a2b52ce185d9067… Author: Yuval Fledel <yuvalfl(a)gmail.com> Date: Sat Apr 21 13:24:44 2007 +0300 include: Introduce ntsecpkg.h. --- include/Makefile.in | 1 + include/ntsecpkg.h | 424 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 425 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d7d6e96a0a2b52ce185d…

1 0

Yuval Fledel : rsaenh: Convert handle type from unsigned int to HCRYPTKEY.
by Alexandre Julliard 23 Apr '07

23 Apr '07

Module: wine Branch: master Commit: 1cdc057091527c99eea3607bca564efd21841d91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cdc057091527c99eea3607bc… Author: Yuval Fledel <yuvalfl(a)gmail.com> Date: Sat Apr 21 22:48:57 2007 +0300 rsaenh: Convert handle type from unsigned int to HCRYPTKEY. --- dlls/rsaenh/handle.c | 30 +++++++++++----------- dlls/rsaenh/handle.h | 12 +++++---- dlls/rsaenh/rsaenh.c | 66 +++++++++++++++++++++++++------------------------- 3 files changed, 55 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1cdc057091527c99eea36…

1 0

James Hawkins : msi: Add an internal MSI_ViewModify.
by Alexandre Julliard 23 Apr '07

23 Apr '07

Module: wine Branch: master Commit: 2b4bf44b793fa1dcf102289b2c789a3284669f07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b4bf44b793fa1dcf102289b2… Author: James Hawkins <truiken(a)gmail.com> Date: Sat Apr 21 06:55:24 2007 -0500 msi: Add an internal MSI_ViewModify. --- dlls/msi/msipriv.h | 1 + dlls/msi/msiquery.c | 31 +++++++++++++++---------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 9a0918a..2a9217c 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -619,6 +619,7 @@ extern UINT MSI_ViewExecute( MSIQUERY*, MSIRECORD * ); extern UINT MSI_ViewFetch( MSIQUERY*, MSIRECORD ** ); extern UINT MSI_ViewClose( MSIQUERY* ); extern UINT MSI_ViewGetColumnInfo(MSIQUERY *, MSICOLINFO, MSIRECORD **); +extern UINT MSI_ViewModify( MSIQUERY *, MSIMODIFY, MSIRECORD * ); extern UINT VIEW_find_column( MSIVIEW *, LPCWSTR, UINT * ); diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index f91a123..abec8d8 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -552,10 +552,23 @@ UINT WINAPI MsiViewGetColumnInfo(MSIHANDLE hView, MSICOLINFO info, MSIHANDLE *hR return r; } +UINT MSI_ViewModify( MSIQUERY *query, MSIMODIFY mode, MSIRECORD *rec ) +{ + MSIVIEW *view = NULL; + + if ( !query || !rec ) + return ERROR_INVALID_HANDLE; + + view = query->view; + if ( !view || !view->ops->modify) + return ERROR_FUNCTION_FAILED; + + return view->ops->modify( view, mode, rec ); +} + UINT WINAPI MsiViewModify( MSIHANDLE hView, MSIMODIFY eModifyMode, MSIHANDLE hRecord) { - MSIVIEW *view = NULL; MSIQUERY *query = NULL; MSIRECORD *rec = NULL; UINT r = ERROR_FUNCTION_FAILED; @@ -566,23 +579,9 @@ UINT WINAPI MsiViewModify( MSIHANDLE hView, MSIMODIFY eModifyMode, if( !query ) return ERROR_INVALID_HANDLE; - view = query->view; - if( !view ) - goto out; - - if( !view->ops->modify ) - goto out; - rec = msihandle2msiinfo( hRecord, MSIHANDLETYPE_RECORD ); - if( !rec ) - { - r = ERROR_INVALID_HANDLE; - goto out; - } + r = MSI_ViewModify( query, eModifyMode, rec ); - r = view->ops->modify( view, eModifyMode, rec ); - -out: msiobj_release( &query->hdr ); if( rec ) msiobj_release( &rec->hdr );

1 0