July 2009 - Wine-commits - list.winehq.org

Daniel Ribeiro : git-notify: Add an option to notify only about specified branches.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: tools Branch: master Commit: b87fdcc46989cbc27541e5d610066b7ee95fb752 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b87fdcc46989cbc27541e5d6… Author: Daniel Ribeiro <drwyrm(a)gmail.com> Date: Mon Jul 6 15:22:45 2009 +0200 git-notify: Add an option to notify only about specified branches. To add more than one branch to the include list, issue more than one "-i branch" arguments, one for each branch. When at least one "-i branch" is used, the -x option will be ignored. --- git-notify | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/git-notify b/git-notify index 50345b1..8c3d523 100755 --- a/git-notify +++ b/git-notify @@ -20,6 +20,7 @@ # -r name Set the git repository name # -s bytes Set the maximum diff size in bytes (-1 for no limit) # -u url Set the URL to the gitweb browser +# -i branch If at least one -i is given, report only for specified branches # -x branch Exclude changes to the specified branch from reports # @@ -65,6 +66,9 @@ my $cia_project_name = git_config( "notify.cia" ); # max number of individual notices before falling back to a single global notice (can be set with -n option) my $max_individual_notices = git_config( "notify.maxnotices" ) || 100; +# branches to include +my @include_list = split /\s+/, git_config( "notify.include" ) || ""; + # branches to exclude my @exclude_list = split /\s+/, git_config( "notify.exclude" ) || ""; @@ -77,6 +81,7 @@ sub usage() print " -r name Set the git repository name\n"; print " -s bytes Set the maximum diff size in bytes (-1 for no limit)\n"; print " -u url Set the URL to the gitweb browser\n"; + print " -i branch If at least one -i is given, report only for specified branches\n"; print " -x branch Exclude changes to the specified branch from reports\n"; exit 1; } @@ -137,6 +142,7 @@ sub parse_options() elsif ($arg eq '-r') { $repos_name = shift @ARGV; } elsif ($arg eq '-s') { $max_diff_size = shift @ARGV; } elsif ($arg eq '-u') { $gitweb_url = shift @ARGV; } + elsif ($arg eq '-i') { push @include_list, shift @ARGV; } elsif ($arg eq '-x') { push @exclude_list, shift @ARGV; } elsif ($arg eq '-d') { $debug++; } else { usage(); } @@ -365,6 +371,8 @@ sub send_all_notices($$$) $ref =~ s/^refs\/heads\///; + return if (@include_list && !grep {$_ eq $ref} @include_list); + if ($old_sha1 eq '0' x 40) # new ref { send_commit_notice( $ref, $new_sha1 ) if $commitlist_address;

1 0

Jacek Caban : mshtml: Don't call AutoRegister on GRE directory - it' s no longer needed.
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: 3ab8778ec9384f03eb5ab0a101f1e92597bca7a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ab8778ec9384f03eb5ab0a10… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 6 13:41:48 2009 +0200 mshtml: Don't call AutoRegister on GRE directory - it's no longer needed. --- dlls/mshtml/nsembed.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 9a3f396..85a3a0d 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -448,10 +448,6 @@ static BOOL init_xpcom(const PRUnichar *gre_path) if(NS_FAILED(nsres)) ERR("AutoRegister(NULL) failed: %08x\n", nsres); - nsres = nsIComponentRegistrar_AutoRegister(registrar, gre_dir); - if(NS_FAILED(nsres)) - ERR("AutoRegister(gre_dir) failed: %08x\n", nsres); - init_nsio(pCompMgr, registrar); }else { ERR("NS_GetComponentRegistrar failed: %08x\n", nsres);

1 0

Michael Stefaniuc : winecfg: Fix regression introduced by 807d75a94e378d05.
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: 4f8ce1b2f2d8dcdfc24489e0ff6d34c0e7c14645 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f8ce1b2f2d8dcdfc24489e0f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 6 11:35:27 2009 +0200 winecfg: Fix regression introduced by 807d75a94e378d05. This is the fix for the "PACKAGE_STRING" Wine release. --- programs/winecfg/Bg.rc | 1 + programs/winecfg/Cs.rc | 1 + programs/winecfg/Da.rc | 1 + programs/winecfg/De.rc | 1 + programs/winecfg/En.rc | 1 + programs/winecfg/Es.rc | 1 + programs/winecfg/Fi.rc | 1 + programs/winecfg/Fr.rc | 1 + programs/winecfg/Hu.rc | 1 + programs/winecfg/It.rc | 1 + programs/winecfg/Ja.rc | 1 + programs/winecfg/Ko.rc | 1 + programs/winecfg/Lt.rc | 1 + programs/winecfg/Nl.rc | 1 + programs/winecfg/No.rc | 1 + programs/winecfg/Pl.rc | 1 + programs/winecfg/Pt.rc | 1 + programs/winecfg/Ro.rc | 1 + programs/winecfg/Ru.rc | 1 + programs/winecfg/Si.rc | 1 + programs/winecfg/Sv.rc | 1 + programs/winecfg/Tr.rc | 1 + programs/winecfg/Zh.rc | 1 + programs/winecfg/winecfg.rc | 1 + 24 files changed, 24 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc index 9ddaf2c..00cfbe8 100644 --- a/programs/winecfg/Bg.rc +++ b/programs/winecfg/Bg.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT diff --git a/programs/winecfg/Cs.rc b/programs/winecfg/Cs.rc index 6f5804b..b34dd06 100644 --- a/programs/winecfg/Cs.rc +++ b/programs/winecfg/Cs.rc @@ -25,6 +25,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" /* Czech strings in CP1250 */ diff --git a/programs/winecfg/Da.rc b/programs/winecfg/Da.rc index b1df6f6..62b781b 100644 --- a/programs/winecfg/Da.rc +++ b/programs/winecfg/Da.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_DANISH, SUBLANG_DEFAULT diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index 045e709..1bedd06 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index 88a6269..f71463a 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -22,6 +22,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc index e22ada4..2ddce6c 100644 --- a/programs/winecfg/Es.rc +++ b/programs/winecfg/Es.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL diff --git a/programs/winecfg/Fi.rc b/programs/winecfg/Fi.rc index 211669e..f6fb85c 100644 --- a/programs/winecfg/Fi.rc +++ b/programs/winecfg/Fi.rc @@ -21,6 +21,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc index 2b4d20b..b63adb1 100644 --- a/programs/winecfg/Fr.rc +++ b/programs/winecfg/Fr.rc @@ -21,6 +21,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" /* UTF-8 */ diff --git a/programs/winecfg/Hu.rc b/programs/winecfg/Hu.rc index e97c7a4..0445c77 100644 --- a/programs/winecfg/Hu.rc +++ b/programs/winecfg/Hu.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT diff --git a/programs/winecfg/It.rc b/programs/winecfg/It.rc index 2ee50cb..aea66df 100644 --- a/programs/winecfg/It.rc +++ b/programs/winecfg/It.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc index eeb0987..a25a953 100644 --- a/programs/winecfg/Ja.rc +++ b/programs/winecfg/Ja.rc @@ -22,6 +22,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" /* UTF-8 */ diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index 151375f..c01b841 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -23,6 +23,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT diff --git a/programs/winecfg/Lt.rc b/programs/winecfg/Lt.rc index e31c2cb..3dd3041 100644 --- a/programs/winecfg/Lt.rc +++ b/programs/winecfg/Lt.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" /* UTF-8 */ diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc index 66bd464..99062cf 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -22,6 +22,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index 2825675..357539e 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL diff --git a/programs/winecfg/Pl.rc b/programs/winecfg/Pl.rc index f7fb619..8e1d9a2 100644 --- a/programs/winecfg/Pl.rc +++ b/programs/winecfg/Pl.rc @@ -23,6 +23,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT diff --git a/programs/winecfg/Pt.rc b/programs/winecfg/Pt.rc index a3b0219..baf2920 100644 --- a/programs/winecfg/Pt.rc +++ b/programs/winecfg/Pt.rc @@ -21,6 +21,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE diff --git a/programs/winecfg/Ro.rc b/programs/winecfg/Ro.rc index fb8a20b..c836d60 100644 --- a/programs/winecfg/Ro.rc +++ b/programs/winecfg/Ro.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc index 9656c48..8d61413 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc @@ -21,6 +21,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT diff --git a/programs/winecfg/Si.rc b/programs/winecfg/Si.rc index 1a8d488..87cd239 100644 --- a/programs/winecfg/Si.rc +++ b/programs/winecfg/Si.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" #pragma code_page(65001) diff --git a/programs/winecfg/Sv.rc b/programs/winecfg/Sv.rc index 5770899..113603c 100644 --- a/programs/winecfg/Sv.rc +++ b/programs/winecfg/Sv.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL diff --git a/programs/winecfg/Tr.rc b/programs/winecfg/Tr.rc index dbe1f2f..883c0f3 100644 --- a/programs/winecfg/Tr.rc +++ b/programs/winecfg/Tr.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT diff --git a/programs/winecfg/Zh.rc b/programs/winecfg/Zh.rc index 349d106..b483cfe 100644 --- a/programs/winecfg/Zh.rc +++ b/programs/winecfg/Zh.rc @@ -21,6 +21,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" /* Chinese text is encoded in UTF-8 */ diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index 7f8fe80..df572fd 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" /* @makedep: idb_wine.bmp */

1 0

Alexandre Julliard : ntdll: Add management of the Wow64 filesystem redirection flag.
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: 747d58d211e76a7c06b2cd412dd43f4d71bbd82e URL: http://source.winehq.org/git/wine.git/?a=commit;h=747d58d211e76a7c06b2cd412… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 6 15:08:39 2009 +0200 ntdll: Add management of the Wow64 filesystem redirection flag. --- dlls/ntdll/directory.c | 23 +++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/ntdll_misc.h | 7 ++++--- dlls/ntdll/process.c | 6 +----- dlls/ntdll/server.c | 8 +++++++- include/winternl.h | 2 ++ 6 files changed, 39 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 41880f4..bccfba6 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2130,6 +2130,29 @@ done: /****************************************************************** + * RtlWow64EnableFsRedirection (NTDLL.@) + */ +NTSTATUS WINAPI RtlWow64EnableFsRedirection( BOOLEAN enable ) +{ + if (!is_wow64) return STATUS_NOT_IMPLEMENTED; + ntdll_get_thread_data()->wow64_redir = enable; + return STATUS_SUCCESS; +} + + +/****************************************************************** + * RtlWow64EnableFsRedirectionEx (NTDLL.@) + */ +NTSTATUS WINAPI RtlWow64EnableFsRedirectionEx( ULONG enable, ULONG *old_value ) +{ + if (!is_wow64) return STATUS_NOT_IMPLEMENTED; + *old_value = ntdll_get_thread_data()->wow64_redir; + ntdll_get_thread_data()->wow64_redir = enable; + return STATUS_SUCCESS; +} + + +/****************************************************************** * RtlDoesFileExists_U (NTDLL.@) */ BOOLEAN WINAPI RtlDoesFileExists_U(LPCWSTR file_name) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index acc69db..03686b2 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -913,6 +913,8 @@ @ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) @ stub RtlWalkFrameChain @ stdcall RtlWalkHeap(long ptr) +@ stdcall RtlWow64EnableFsRedirection(long) +@ stdcall RtlWow64EnableFsRedirectionEx(long ptr) @ stub RtlWriteMemoryStream @ stdcall RtlWriteRegistryValue(long ptr ptr long ptr long) @ stub RtlZeroHeap diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 8da7148..3032553 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -71,7 +71,7 @@ extern void virtual_init_threading(void); /* server support */ extern timeout_t server_start_time; -extern unsigned int server_cpus; +extern int is_wow64; extern void server_init_process(void); extern NTSTATUS server_init_process_done(void); extern size_t server_init_thread( void *entry_point ); @@ -198,8 +198,9 @@ struct ntdll_thread_data int request_fd; /* 1e0/310 fd for sending server requests */ int reply_fd; /* 1e4/314 fd for receiving server replies */ int wait_fd[2]; /* 1e8/318 fd for sleeping server requests */ - void *vm86_ptr; /* 1f0/320 data for vm86 mode */ - pthread_t pthread_id; /* 1f4/328 pthread thread id */ + BOOL wow64_redir; /* 1f0/320 Wow64 filesystem redirection flag */ + void *vm86_ptr; /* 1f4/328 data for vm86 mode */ + pthread_t pthread_id; /* 1f8/330 pthread thread id */ }; static inline struct ntdll_thread_data *ntdll_get_thread_data(void) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index c129e0a..9ec5513 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -307,11 +307,7 @@ NTSTATUS WINAPI NtQueryInformationProcess( case ProcessWow64Information: if (ProcessInformationLength == sizeof(DWORD)) { -#ifdef __i386__ - *(DWORD *)ProcessInformation = (server_cpus & (1 << CPU_x86_64)) != 0; -#else - *(DWORD *)ProcessInformation = FALSE; -#endif + *(DWORD *)ProcessInformation = is_wow64; len = sizeof(DWORD); } else ret = STATUS_INFO_LENGTH_MISMATCH; diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index e90ea72..a4f2953 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -94,7 +94,8 @@ static const enum cpu_type client_cpu = CPU_SPARC; #error Unsupported CPU #endif -unsigned int server_cpus = 0; +static unsigned int server_cpus; +int is_wow64 = FALSE; #ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS /* data structure used to pass an fd with sendmsg/recvmsg */ @@ -1081,6 +1082,11 @@ size_t server_init_thread( void *entry_point ) } SERVER_END_REQ; +#ifndef _WIN64 + is_wow64 = (server_cpus & (1 << CPU_x86_64)) != 0; +#endif + ntdll_get_thread_data()->wow64_redir = is_wow64; + if (ret) { if (ret == STATUS_NOT_SUPPORTED) diff --git a/include/winternl.h b/include/winternl.h index b386787..6d0b480 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2512,6 +2512,8 @@ NTSYSAPI BOOLEAN WINAPI RtlValidSid(PSID); NTSYSAPI BOOLEAN WINAPI RtlValidateHeap(HANDLE,ULONG,LPCVOID); NTSYSAPI NTSTATUS WINAPI RtlVerifyVersionInfo(const RTL_OSVERSIONINFOEXW*,DWORD,DWORDLONG); NTSYSAPI NTSTATUS WINAPI RtlWalkHeap(HANDLE,PVOID); +NTSYSAPI NTSTATUS WINAPI RtlWow64EnableFsRedirection(BOOLEAN); +NTSYSAPI NTSTATUS WINAPI RtlWow64EnableFsRedirectionEx(ULONG,ULONG*); NTSYSAPI NTSTATUS WINAPI RtlWriteRegistryValue(ULONG,PCWSTR,PCWSTR,ULONG,PVOID,ULONG); NTSYSAPI NTSTATUS WINAPI RtlpNtCreateKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG,const UNICODE_STRING*,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI RtlpNtEnumerateSubKey(HANDLE,UNICODE_STRING *, ULONG);

1 0

Alexandre Julliard : kernel32: Forward the Wow64 redirection functions to ntdll.
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: 26caf2fdda95f1934e329aa27f4d681d09390ebe URL: http://source.winehq.org/git/wine.git/?a=commit;h=26caf2fdda95f1934e329aa27… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 6 15:09:29 2009 +0200 kernel32: Forward the Wow64 redirection functions to ntdll. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/path.c | 25 +++++++++++++++++++------ include/winbase.h | 3 +++ 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 5182e71..fc3b6ae 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1144,6 +1144,7 @@ @ stdcall WaitNamedPipeW (wstr long) @ stdcall WideCharToMultiByte(long long wstr long ptr long ptr ptr) @ stdcall WinExec(str long) +@ stdcall Wow64EnableWow64FsRedirection(long) @ stdcall Wow64DisableWow64FsRedirection(ptr) @ stdcall Wow64RevertWow64FsRedirection(ptr) @ stdcall WriteConsoleA(long ptr long ptr ptr) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 2633d90..0b3a87e 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1539,24 +1539,37 @@ UINT WINAPI GetSystemWow64DirectoryA( LPSTR lpBuffer, UINT uSize ) return 0; } + +/*********************************************************************** + * Wow64EnableWow64FsRedirection (KERNEL32.@) + */ +BOOLEAN WINAPI Wow64EnableWow64FsRedirection( BOOLEAN enable ) +{ + NTSTATUS status = RtlWow64EnableFsRedirection( enable ); + if (status) SetLastError( RtlNtStatusToDosError(status) ); + return !status; +} + + /*********************************************************************** * Wow64DisableWow64FsRedirection (KERNEL32.@) */ BOOL WINAPI Wow64DisableWow64FsRedirection( PVOID *old_value ) { - FIXME("%p\n", old_value); - - if (old_value) *old_value = (void *)0xdeadbeef; - return TRUE; + NTSTATUS status = RtlWow64EnableFsRedirectionEx( TRUE, (ULONG *)old_value ); + if (status) SetLastError( RtlNtStatusToDosError(status) ); + return !status; } + /*********************************************************************** * Wow64RevertWow64FsRedirection (KERNEL32.@) */ BOOL WINAPI Wow64RevertWow64FsRedirection( PVOID old_value ) { - FIXME("%p\n", old_value); - return TRUE; + NTSTATUS status = RtlWow64EnableFsRedirection( (UINT_PTR)old_value ); + if (status) SetLastError( RtlNtStatusToDosError(status) ); + return !status; } diff --git a/include/winbase.h b/include/winbase.h index 0794fc6..a7eaf9d 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2143,6 +2143,9 @@ WINBASEAPI BOOL WINAPI WaitNamedPipeA(LPCSTR,DWORD); WINBASEAPI BOOL WINAPI WaitNamedPipeW(LPCWSTR,DWORD); #define WaitNamedPipe WINELIB_NAME_AW(WaitNamedPipe) WINBASEAPI UINT WINAPI WinExec(LPCSTR,UINT); +WINBASEAPI BOOL WINAPI Wow64DisableWow64FsRedirection(PVOID*); +WINBASEAPI BOOLEAN WINAPI Wow64EnableWow64FsRedirection(BOOLEAN); +WINBASEAPI BOOL WINAPI Wow64RevertWow64FsRedirection(PVOID); WINBASEAPI BOOL WINAPI WriteFile(HANDLE,LPCVOID,DWORD,LPDWORD,LPOVERLAPPED); WINBASEAPI BOOL WINAPI WriteFileEx(HANDLE,LPCVOID,DWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE); WINBASEAPI BOOL WINAPI WriteFileGather(HANDLE,FILE_SEGMENT_ELEMENT*,DWORD,LPDWORD,LPOVERLAPPED);

1 0

Roderick Colenbrander : winex11: Get rid of the static Xrender picture format table.
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: 8262e0a80067e75d3ff81ab4292907db9e95d157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8262e0a80067e75d3ff81ab42… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Jul 5 20:35:01 2009 +0200 winex11: Get rid of the static Xrender picture format table. --- dlls/winex11.drv/xrender.c | 245 +++++++++++++++++++++++++++++++++++--------- 1 files changed, 197 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8262e0a80067e75d3ff81…

1 0

Roderick Colenbrander : winex11: Move AlphaBlend over to get_xrender_format .
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: bf86daa0b676533d8c7f7f68e1825e28751b106b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf86daa0b676533d8c7f7f68e… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Jul 5 20:52:19 2009 +0200 winex11: Move AlphaBlend over to get_xrender_format. --- dlls/winex11.drv/xrender.c | 44 ++++++++------------------------------------ 1 files changed, 8 insertions(+), 36 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index e3d2105..afbadb3 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1739,35 +1739,6 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid BLENDFUNCTION blendfn) { XRenderPictureAttributes pa; - XRenderPictFormat *src_format; - XRenderPictFormat argb32_templ = { - 0, /* id */ - PictTypeDirect, /* type */ - 32, /* depth */ - { /* direct */ - 16, /* direct.red */ - 0xff, /* direct.redMask */ - 8, /* direct.green */ - 0xff, /* direct.greenMask */ - 0, /* direct.blue */ - 0xff, /* direct.blueMask */ - 24, /* direct.alpha */ - 0xff, /* direct.alphaMask */ - }, - 0, /* colormap */ - }; - unsigned long argb32_templ_mask = - PictFormatType | - PictFormatDepth | - PictFormatRed | - PictFormatRedMask | - PictFormatGreen | - PictFormatGreenMask | - PictFormatBlue | - PictFormatBlueMask | - PictFormatAlpha | - PictFormatAlphaMask; - Picture dst_pict, src_pict; Pixmap xpm; DIBSECTION dib; @@ -1780,6 +1751,7 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid BOOL top_down = FALSE; RGNDATA *rgndata; WineXRenderFormat *dst_format = get_xrender_format_from_pdevice(devDst); + WineXRenderFormat *src_format; int repeat_src; if(!X11DRV_XRender_Installed) { @@ -1896,13 +1868,13 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid image = XCreateImage(gdi_display, visual, 32, ZPixmap, 0, (char*) data, widthSrc, heightSrc, 32, widthSrc * 4); - /* - Avoid using XRenderFindStandardFormat as older libraries don't have it - src_format = pXRenderFindStandardFormat(gdi_display, PictStandardARGB32); - */ - src_format = pXRenderFindFormat(gdi_display, argb32_templ_mask, &argb32_templ, 0); - + src_format = get_xrender_format(WXR_FORMAT_A8R8G8B8); TRACE("src_format %p\n", src_format); + if(!src_format) + { + WARN("Unable to find a picture format supporting alpha, make sure X is running at 24-bit\n"); + return FALSE; + } pa.subwindow_mode = IncludeInferiors; pa.repeat = repeat_src ? RepeatNormal : RepeatNone; @@ -1923,7 +1895,7 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid XPutImage(gdi_display, xpm, gc, image, 0, 0, 0, 0, widthSrc, heightSrc); src_pict = pXRenderCreatePicture(gdi_display, - xpm, src_format, + xpm, src_format->pict_format, CPSubwindowMode|CPRepeat, &pa); TRACE("src_pict %08lx\n", src_pict);

1 0

Roderick Colenbrander : winex11: Move glyph code over to get_xrender_format .
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: e13865285eae43abd8d0b04dcb6182e0b0694e78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e13865285eae43abd8d0b04dc… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Jul 5 21:03:48 2009 +0200 winex11: Move glyph code over to get_xrender_format. --- dlls/winex11.drv/xrender.c | 71 ++++++++++++++++---------------------------- 1 files changed, 26 insertions(+), 45 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index afbadb3..dd53f23 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -54,10 +54,11 @@ static BOOL X11DRV_XRender_Installed = FALSE; #define RepeatReflect 3 #endif -#define MAX_FORMATS 9 +#define MAX_FORMATS 10 typedef enum wine_xrformat { WXR_FORMAT_MONO, + WXR_FORMAT_GRAY, WXR_FORMAT_X1R5G5B5, WXR_FORMAT_X1B5G5R5, WXR_FORMAT_R5G6B5, @@ -86,6 +87,7 @@ static const WineXRenderFormatTemplate wxr_formats_template[] = { /* Format depth alpha mask red mask green mask blue mask*/ {WXR_FORMAT_MONO, 1, 0, 0x01, 0, 0, 0, 0, 0, 0 }, + {WXR_FORMAT_GRAY, 8, 0, 0xff, 0, 0, 0, 0, 0, 0 }, {WXR_FORMAT_X1R5G5B5, 16, 0, 0, 10, 0x1f, 5, 0x1f, 0, 0x1f }, {WXR_FORMAT_X1B5G5R5, 16, 0, 0, 0, 0x1f, 5, 0x1f, 10, 0x1f }, {WXR_FORMAT_R5G6B5, 16, 0, 0, 11, 0x1f, 5, 0x3f, 0, 0x1f }, @@ -121,7 +123,7 @@ typedef enum { AA_None = 0, AA_Grey, AA_RGB, AA_BGR, AA_VRGB, AA_VBGR, AA_MAXVAL typedef struct { GlyphSet glyphset; - XRenderPictFormat *font_format; + WineXRenderFormat *font_format; int nrealized; BOOL *realized; void **bitmaps; @@ -828,8 +830,7 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format) gsCacheEntry *entry = glyphsetCache + physDev->xrender->cache_index; gsCacheEntryFormat *formatEntry; UINT ggo_format = GGO_GLYPH_INDEX; - XRenderPictFormat pf; - unsigned long pf_mask; + WXRFormat wxr_format; static const char zero[4]; static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; @@ -918,48 +919,28 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format) if(formatEntry->glyphset == 0 && X11DRV_XRender_Installed) { switch(format) { - case AA_Grey: - pf_mask = PictFormatType | PictFormatDepth | PictFormatAlpha | PictFormatAlphaMask, - pf.type = PictTypeDirect; - pf.depth = 8; - pf.direct.alpha = 0; - pf.direct.alphaMask = 0xff; - break; - - case AA_RGB: - case AA_BGR: - case AA_VRGB: - case AA_VBGR: - pf_mask = PictFormatType | PictFormatDepth | PictFormatRed | PictFormatRedMask | - PictFormatGreen | PictFormatGreenMask | PictFormatBlue | - PictFormatBlueMask | PictFormatAlpha | PictFormatAlphaMask; - pf.type = PictTypeDirect; - pf.depth = 32; - pf.direct.red = 16; - pf.direct.redMask = 0xff; - pf.direct.green = 8; - pf.direct.greenMask = 0xff; - pf.direct.blue = 0; - pf.direct.blueMask = 0xff; - pf.direct.alpha = 24; - pf.direct.alphaMask = 0xff; - break; + case AA_Grey: + wxr_format = WXR_FORMAT_GRAY; + break; - default: - ERR("aa = %d - not implemented\n", format); - case AA_None: - pf_mask = PictFormatType | PictFormatDepth | PictFormatAlpha | PictFormatAlphaMask, - pf.type = PictTypeDirect; - pf.depth = 1; - pf.direct.alpha = 0; - pf.direct.alphaMask = 1; - break; - } + case AA_RGB: + case AA_BGR: + case AA_VRGB: + case AA_VBGR: + wxr_format = WXR_FORMAT_A8R8G8B8; + break; - wine_tsx11_lock(); - formatEntry->font_format = pXRenderFindFormat(gdi_display, pf_mask, &pf, 0); - formatEntry->glyphset = pXRenderCreateGlyphSet(gdi_display, formatEntry->font_format); - wine_tsx11_unlock(); + default: + ERR("aa = %d - not implemented\n", format); + case AA_None: + wxr_format = WXR_FORMAT_MONO; + break; + } + + wine_tsx11_lock(); + formatEntry->font_format = get_xrender_format(wxr_format); + formatEntry->glyphset = pXRenderCreateGlyphSet(gdi_display, formatEntry->font_format->pict_format); + wine_tsx11_unlock(); } @@ -1571,7 +1552,7 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag pXRenderCompositeText16(gdi_display, render_op, tile_pict, physDev->xrender->pict, - formatEntry->font_format, + formatEntry->font_format->pict_format, 0, 0, 0, 0, elts, count); wine_tsx11_unlock(); HeapFree(GetProcessHeap(), 0, elts);

1 0

Hib Eris : msi/tests: Add tests for MsiViewModify ASSIGN mode.
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: eaea537f0f0cbefc55b5fb8bb023e2cd779f810d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaea537f0f0cbefc55b5fb8bb… Author: Hib Eris <hib(a)hiberis.nl> Date: Mon Jul 6 12:24:48 2009 +0200 msi/tests: Add tests for MsiViewModify ASSIGN mode. --- dlls/msi/tests/db.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 122 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 43b5648..e694ea3 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -4763,6 +4763,127 @@ static void test_viewmodify_update(void) ok(r == ERROR_SUCCESS, "MsiOpenDatabase close failed\n"); } +static void test_viewmodify_assign(void) +{ + MSIHANDLE hdb = 0, hview = 0, hrec = 0; + const char *query; + UINT r; + + /* setup database */ + DeleteFile(msifile); + + r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); + ok(r == ERROR_SUCCESS, "MsiOpenDatabase failed\n"); + + query = "CREATE TABLE `table` (`A` INT, `B` INT PRIMARY KEY `A`)"; + r = run_query( hdb, 0, query ); + ok(r == ERROR_SUCCESS, "query failed\n"); + + /* assign to view, new primary key */ + query = "SELECT * FROM `table`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + + hrec = MsiCreateRecord(2); + ok(hrec != 0, "MsiCreateRecord failed\n"); + + r = MsiRecordSetInteger(hrec, 1, 1); + ok(r == ERROR_SUCCESS, "failed to set integer\n"); + r = MsiRecordSetInteger(hrec, 2, 2); + ok(r == ERROR_SUCCESS, "failed to set integer\n"); + + r = MsiViewModify(hview, MSIMODIFY_ASSIGN, hrec); + todo_wine ok(r == ERROR_SUCCESS, "MsiViewModify failed: %d\n", r); + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + query = "SELECT * FROM `table`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + r = MsiViewFetch(hview, &hrec); + todo_wine ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + + r = MsiRecordGetInteger(hrec, 1); + todo_wine ok(r == 1, "Expected 1, got %d\n", r); + r = MsiRecordGetInteger(hrec, 2); + todo_wine ok(r == 2, "Expected 2, got %d\n", r); + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + /* assign to view, primary key matches */ + query = "SELECT * FROM `table`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + + hrec = MsiCreateRecord(2); + ok(hrec != 0, "MsiCreateRecord failed\n"); + + r = MsiRecordSetInteger(hrec, 1, 1); + ok(r == ERROR_SUCCESS, "failed to set integer\n"); + r = MsiRecordSetInteger(hrec, 2, 4); + ok(r == ERROR_SUCCESS, "failed to set integer\n"); + + r = MsiViewModify(hview, MSIMODIFY_ASSIGN, hrec); + todo_wine ok(r == ERROR_SUCCESS, "MsiViewModify failed: %d\n", r); + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + query = "SELECT * FROM `table`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + r = MsiViewFetch(hview, &hrec); + todo_wine ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + + r = MsiRecordGetInteger(hrec, 1); + todo_wine ok(r == 1, "Expected 1, got %d\n", r); + r = MsiRecordGetInteger(hrec, 2); + todo_wine ok(r == 4, "Expected 4, got %d\n", r); + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + /* close database */ + r = MsiCloseHandle( hdb ); + ok(r == ERROR_SUCCESS, "MsiOpenDatabase close failed\n"); +} + static const WCHAR data10[] = { /* MOO */ 0x8001, 0x000b, }; @@ -8099,6 +8220,7 @@ START_TEST(db) test_tables_order(); test_select_markers(); test_viewmodify_update(); + test_viewmodify_assign(); test_stringtable(); test_viewmodify_delete(); test_defaultdatabase();

1 0

Hib Eris : msi: Implement ASSIGN mode in MsiViewModify.
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: ec4edbfd6c35a76327bf06e7677170afa5aad265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec4edbfd6c35a76327bf06e76… Author: Hib Eris <hib(a)hiberis.nl> Date: Mon Jul 6 12:26:20 2009 +0200 msi: Implement ASSIGN mode in MsiViewModify. --- dlls/msi/table.c | 18 ++++++++++++++++++ dlls/msi/tests/db.c | 16 ++++++++-------- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index dc21b3b..126769a 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1711,6 +1711,21 @@ static UINT msi_table_update(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row) return TABLE_set_row(view, new_row, rec, (1 << tv->num_cols) - 1); } +static UINT msi_table_assign(struct tagMSIVIEW *view, MSIRECORD *rec) +{ + MSITABLEVIEW *tv = (MSITABLEVIEW *)view; + UINT r, row; + + if (!tv->table) + return ERROR_INVALID_PARAMETER; + + r = msi_table_find_row(tv, rec, &row); + if (r == ERROR_SUCCESS) + return TABLE_set_row(view, row, rec, (1 << tv->num_cols) - 1); + else + return TABLE_insert_row( view, rec, -1, FALSE ); +} + static UINT modify_delete_row( struct tagMSIVIEW *view, MSIRECORD *rec ) { MSITABLEVIEW *tv = (MSITABLEVIEW *)view; @@ -1780,6 +1795,9 @@ static UINT TABLE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, break; case MSIMODIFY_ASSIGN: + r = msi_table_assign( view, rec ); + break; + case MSIMODIFY_REPLACE: case MSIMODIFY_MERGE: case MSIMODIFY_VALIDATE: diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index e694ea3..019ff5e 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -4795,7 +4795,7 @@ static void test_viewmodify_assign(void) ok(r == ERROR_SUCCESS, "failed to set integer\n"); r = MsiViewModify(hview, MSIMODIFY_ASSIGN, hrec); - todo_wine ok(r == ERROR_SUCCESS, "MsiViewModify failed: %d\n", r); + ok(r == ERROR_SUCCESS, "MsiViewModify failed: %d\n", r); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n"); @@ -4811,12 +4811,12 @@ static void test_viewmodify_assign(void) r = MsiViewExecute(hview, 0); ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); r = MsiViewFetch(hview, &hrec); - todo_wine ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); r = MsiRecordGetInteger(hrec, 1); - todo_wine ok(r == 1, "Expected 1, got %d\n", r); + ok(r == 1, "Expected 1, got %d\n", r); r = MsiRecordGetInteger(hrec, 2); - todo_wine ok(r == 2, "Expected 2, got %d\n", r); + ok(r == 2, "Expected 2, got %d\n", r); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n"); @@ -4845,7 +4845,7 @@ static void test_viewmodify_assign(void) ok(r == ERROR_SUCCESS, "failed to set integer\n"); r = MsiViewModify(hview, MSIMODIFY_ASSIGN, hrec); - todo_wine ok(r == ERROR_SUCCESS, "MsiViewModify failed: %d\n", r); + ok(r == ERROR_SUCCESS, "MsiViewModify failed: %d\n", r); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n"); @@ -4861,12 +4861,12 @@ static void test_viewmodify_assign(void) r = MsiViewExecute(hview, 0); ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); r = MsiViewFetch(hview, &hrec); - todo_wine ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); r = MsiRecordGetInteger(hrec, 1); - todo_wine ok(r == 1, "Expected 1, got %d\n", r); + ok(r == 1, "Expected 1, got %d\n", r); r = MsiRecordGetInteger(hrec, 2); - todo_wine ok(r == 4, "Expected 4, got %d\n", r); + ok(r == 4, "Expected 4, got %d\n", r); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n");

1 0