December 2013 - Wine-Commits

Francois Gouget : testbot: PowerOff() should not return an error if a VM is already off.
by Alexandre Julliard Dec. 17, 2013

Dec. 17, 2013

Module: tools Branch: master Commit: bf33ef2713e9dc2dffc463d2de97e8c7d42b03a2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=bf33ef2713e9dc2dffc463d2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 17 11:00:48 2013 +0100 testbot: PowerOff() should not return an error if a VM is already off. VMs may be put in unexpected states when an administrator manually reconfigures them. So, even though we normally don't call PowerOff() on powered off VMs, robustness dictates this change. Also ensure that if an error does occur the error message contains the VM name. This fixes various 'Scheduling problem in HandleXxx' error reports. --- testbot/bin/RevertVM.pl | 13 +++++-------- testbot/lib/WineTestBot/VMs.pm | 20 +++++++++++++++----- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl index 5f98191..2ce3be1 100755 --- a/testbot/bin/RevertVM.pl +++ b/testbot/bin/RevertVM.pl @@ -97,15 +97,12 @@ if (defined($ErrMessage)) FatalError "Can't change status for VM $VMKey: $ErrMessage", $VM; } -if ($VM->IsPoweredOn()) +# Some QEmu/KVM versions are buggy and cannot revert a running VM +$ErrMessage = $VM->PowerOff(1); +if (defined $ErrMessage) { - # Some QEmu/KVM versions are buggy and cannot revert a running VM - $ErrMessage = $VM->PowerOff(1); - if (defined $ErrMessage) - { - LogMsg "Could not shut down $VMKey: $ErrMessage\n"; - LogMsg "Trying the revert anyway\n"; - } + LogMsg "$ErrMessage\n"; + LogMsg "Trying the revert anyway\n"; } $ErrMessage = $VM->RevertToSnapshot($VM->IdleSnapshot); diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 7c403cd..d4267e0 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -375,11 +375,21 @@ sub PowerOff($$) my ($ErrMessage, $Domain) = $self->_GetDomain(); return $ErrMessage if (defined $ErrMessage); - eval { $Domain->destroy() }; - return $@->message() if ($@); - - return $self->UpdateStatus($Domain) if (!$NoStatus); - return undef; + if ($self->IsPoweredOn()) + { + eval { $Domain->destroy() }; + if ($@) + { + $ErrMessage = $@->message(); + } + elsif ($self->IsPoweredOn()) + { + $ErrMessage = "The VM is still active"; + } + } + $ErrMessage ||= $self->UpdateStatus($Domain) if (!$NoStatus); + return undef if (!defined $ErrMessage); + return join("", "Could not power off ", $self->Name, ": ", $ErrMessage); } sub GetAgent($)

1 0

Francois Gouget : testbot: Renamed FilterHypervisors() to make it clearer it takes a list of hypervisors.
by Alexandre Julliard Dec. 17, 2013

Dec. 17, 2013

Module: tools Branch: master Commit: 4561043d9d57b397856838abc0c89bc4761ba2f2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=4561043d9d57b397856838ab… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 17 11:01:42 2013 +0100 testbot: Renamed FilterHypervisors() to make it clearer it takes a list of hypervisors. --- testbot/lib/WineTestBot/Jobs.pm | 2 +- testbot/lib/WineTestBot/VMs.pm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 94eae04..5d50fde 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -433,7 +433,7 @@ sub ScheduleOnHost($$) my $HostVMs = CreateVMs(); $HostVMs->FilterEnabledRole(); - $HostVMs->FilterHypervisor($Hypervisors); + $HostVMs->FilterHypervisors($Hypervisors); # Count the VMs that are 'active', that is, that use resources on the host, # and those that are reverting. Also build a prioritized list of those that diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index d4267e0..55c7c6c 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -702,12 +702,12 @@ sub FilterEnabledStatus($) $self->AddFilter("Status", ["dirty", "reverting", "sleeping", "idle", "running", "off"]); } -sub FilterHypervisor +sub FilterHypervisors($$) { my $self = shift; - my $Hypervisor = $_[0]; + my $Hypervisors = $_[0]; - $self->AddFilter("VirtURI", $Hypervisor); + $self->AddFilter("VirtURI", $Hypervisors); } 1;

1 0

Francois Gouget : testbot: Only schedule active VMs.
by Alexandre Julliard Dec. 17, 2013

Dec. 17, 2013

Module: tools Branch: master Commit: 9778857dac6c0932745b8796adcffb047fced233 URL: http://source.winehq.org/git/tools.git/?a=commit;h=9778857dac6c0932745b8796… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 17 11:01:05 2013 +0100 testbot: Only schedule active VMs. The retired and deleted VMs should be ignored, even if they look like they are running. --- testbot/lib/WineTestBot/Jobs.pm | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index e9a5119..94eae04 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -432,6 +432,7 @@ sub ScheduleOnHost($$) my ($SortedJobs, $Hypervisors) = @_; my $HostVMs = CreateVMs(); + $HostVMs->FilterEnabledRole(); $HostVMs->FilterHypervisor($Hypervisors); # Count the VMs that are 'active', that is, that use resources on the host,

1 0

Francois Gouget : testbot/TestAgent: Fix create_ip_socket().
by Alexandre Julliard Dec. 17, 2013

Dec. 17, 2013

Module: tools Branch: master Commit: 25149bf382b7fae85d4a6ce46b78481bdd14dc6c URL: http://source.winehq.org/git/tools.git/?a=commit;h=25149bf382b7fae85d4a6ce4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 17 11:01:24 2013 +0100 testbot/TestAgent: Fix create_ip_socket(). It's not supposed to mask exceptions as that prevents the detection of connection timeouts. --- testbot/lib/WineTestBot/TestAgent.pm | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index f542991..dfc86e3 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -790,9 +790,7 @@ sub _SendFile($$$) sub create_ip_socket(@) { - my $socket; - eval { $socket = IO::Socket::IP->new(@_); }; - return $socket; + return IO::Socket::IP->new(@_); } sub create_inet_socket(@)

1 0

Jonathan Liu : winebuild: Don't crash when dlltool or ar can't be found.
by Alexandre Julliard Dec. 16, 2013

Dec. 16, 2013

Module: wine Branch: master Commit: 9c992f8a15810bf22b4604ef1e6f405ca681aa6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c992f8a15810bf22b4604ef1… Author: Jonathan Liu <net147(a)gmail.com> Date: Sat Dec 14 16:50:00 2013 +1100 winebuild: Don't crash when dlltool or ar can't be found. --- tools/winebuild/utils.c | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index e838165..f665e31 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -323,7 +323,7 @@ struct strarray *find_tool( const char *name, const char * const *names ) /* split the path in directories */ - if (!getenv( "PATH" )) return NULL; + if (!getenv( "PATH" )) fatal_error( "PATH not set, cannot find required tools\n" ); path = xstrdup( getenv( "PATH" )); for (p = path, count = 2; *p; p++) if (*p == PATH_SEPARATOR) count++; dirs = xmalloc( count * sizeof(*dirs) ); @@ -374,7 +374,7 @@ struct strarray *find_tool( const char *name, const char * const *names ) free( file ); names++; } - return NULL; + fatal_error( "cannot find the '%s' tool\n", name ); } struct strarray *get_as_command(void) @@ -397,9 +397,6 @@ struct strarray *get_as_command(void) as_command = find_tool( "as", commands ); } - if (!as_command) - fatal_error( "cannot find suitable assembler\n" ); - args = strarray_copy( as_command ); if (force_pointer_size) @@ -437,9 +434,6 @@ struct strarray *get_ld_command(void) ld_command = find_tool( "ld", commands ); } - if (!ld_command) - fatal_error( "cannot find suitable linker\n" ); - args = strarray_copy( ld_command ); if (force_pointer_size) @@ -475,9 +469,6 @@ const char *get_nm_command(void) static const char * const commands[] = { "nm", "gnm", NULL }; nm_command = find_tool( "nm", commands ); } - - if (!nm_command) - fatal_error( "cannot find suitable name lister\n" ); if (nm_command->count > 1) fatal_error( "multiple arguments in nm command not supported yet\n" ); return nm_command->str[0];

1 0

Frédéric Delanoy : dbghelp: Constify some character strings.
by Alexandre Julliard Dec. 16, 2013

Dec. 16, 2013

Module: wine Branch: master Commit: d0665616255ae8b720e14e02072996b7aa198b00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0665616255ae8b720e14e020… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Dec 16 00:31:00 2013 +0100 dbghelp: Constify some character strings. --- dlls/dbghelp/elf_module.c | 2 +- dlls/dbghelp/macho_module.c | 2 +- dlls/dbghelp/symbol.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index f77fbdd..b176143 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1470,7 +1470,7 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename, { BOOL ret = FALSE; struct module* module; - static WCHAR S_libstdcPPW[] = {'l','i','b','s','t','d','c','+','+','\0'}; + static const WCHAR S_libstdcPPW[] = {'l','i','b','s','t','d','c','+','+','\0'}; if (filename == NULL || *filename == '\0') return FALSE; if ((module = module_is_already_loaded(pcs, filename))) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 08028b1..c6270c8 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1160,7 +1160,7 @@ static BOOL macho_search_and_load_file(struct process* pcs, const WCHAR* filenam { BOOL ret = FALSE; struct module* module; - static WCHAR S_libstdcPPW[] = {'l','i','b','s','t','d','c','+','+','\0'}; + static const WCHAR S_libstdcPPW[] = {'l','i','b','s','t','d','c','+','+','\0'}; const WCHAR* p; TRACE("(%p/%p, %s, 0x%08lx, %p)\n", pcs, pcs->handle, debugstr_w(filename), load_addr, diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 8c482c7..a82d1df 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); WINE_DECLARE_DEBUG_CHANNEL(dbghelp_symt); -static WCHAR starW[] = {'*','\0'}; +static const WCHAR starW[] = {'*','\0'}; static inline int cmp_addr(ULONG64 a1, ULONG64 a2) {

1 0

Alexandre Bique : winealsa.drv: midiSeq must be protected by a critical section.
by Alexandre Julliard Dec. 16, 2013

Dec. 16, 2013

Module: wine Branch: master Commit: ffccadd335066b49e57e7adbaa924868f0549904 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffccadd335066b49e57e7adba… Author: Alexandre Bique <bique.alexandre(a)gmail.com> Date: Thu Dec 12 18:54:48 2013 +0100 winealsa.drv: midiSeq must be protected by a critical section. --- dlls/winealsa.drv/midi.c | 51 ++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 4e74440..6fc75ee 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -95,6 +95,14 @@ static int MODM_NumDevs = 0; /* this is the total number of MIDI out devices found */ static int MIDM_NumDevs = 0; +static CRITICAL_SECTION midiSeqLock; +static CRITICAL_SECTION_DEBUG midiSeqLockDebug = +{ + 0, 0, &midiSeqLock, + { &midiSeqLockDebug.ProcessLocksList, &midiSeqLockDebug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": midiSeqLock") } +}; +static CRITICAL_SECTION midiSeqLock = { &midiSeqLockDebug, -1, 0, 0, 0, 0 }; static snd_seq_t* midiSeq = NULL; static int numOpenMidiSeq = 0; static int numStartedMidiIn = 0; @@ -222,6 +230,7 @@ static BOOL midi_warn = TRUE; */ static int midiOpenSeq(BOOL create_client) { + EnterCriticalSection(&midiSeqLock); if (numOpenMidiSeq == 0) { if (snd_seq_open(&midiSeq, "default", SND_SEQ_OPEN_DUPLEX, 0) < 0) { @@ -230,6 +239,7 @@ static int midiOpenSeq(BOOL create_client) WARN("Error opening ALSA sequencer.\n"); } midi_warn = FALSE; + LeaveCriticalSection(&midiSeqLock); return -1; } @@ -262,6 +272,7 @@ static int midiOpenSeq(BOOL create_client) } } numOpenMidiSeq++; + LeaveCriticalSection(&midiSeqLock); return 0; } @@ -270,12 +281,14 @@ static int midiOpenSeq(BOOL create_client) */ static int midiCloseSeq(void) { + EnterCriticalSection(&midiSeqLock); if (--numOpenMidiSeq == 0) { snd_seq_delete_simple_port(midiSeq, port_out); snd_seq_delete_simple_port(midiSeq, port_in); snd_seq_close(midiSeq); midiSeq = NULL; } + LeaveCriticalSection(&midiSeqLock); return 0; } @@ -283,14 +296,17 @@ static DWORD WINAPI midRecThread(LPVOID arg) { int npfd; struct pollfd *pfd; + int ret; TRACE("Thread startup\n"); while(!end_thread) { TRACE("Thread loop\n"); + EnterCriticalSection(&midiSeqLock); npfd = snd_seq_poll_descriptors_count(midiSeq, POLLIN); pfd = HeapAlloc(GetProcessHeap(), 0, npfd * sizeof(struct pollfd)); snd_seq_poll_descriptors(midiSeq, pfd, npfd, POLLIN); + LeaveCriticalSection(&midiSeqLock); /* Check if an event is present */ if (poll(pfd, npfd, 250) <= 0) { @@ -309,7 +325,9 @@ static DWORD WINAPI midRecThread(LPVOID arg) do { WORD wDevID; snd_seq_event_t* ev; + EnterCriticalSection(&midiSeqLock); snd_seq_event_input(midiSeq, &ev); + LeaveCriticalSection(&midiSeqLock); /* Find the target device */ for (wDevID = 0; wDevID < MIDM_NumDevs; wDevID++) if ( (ev->source.client == MidiInDev[wDevID].addr.client) && (ev->source.port == MidiInDev[wDevID].addr.port) ) @@ -415,7 +433,11 @@ static DWORD WINAPI midRecThread(LPVOID arg) } } snd_seq_free_event(ev); - } while(snd_seq_event_input_pending(midiSeq, 0) > 0); + + EnterCriticalSection(&midiSeqLock); + ret = snd_seq_event_input_pending(midiSeq, 0); + LeaveCriticalSection(&midiSeqLock); + } while(ret > 0); HeapFree(GetProcessHeap(), 0, pfd); } @@ -443,6 +465,8 @@ static DWORD midGetDevCaps(WORD wDevID, LPMIDIINCAPSW lpCaps, DWORD dwSize) */ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) { + int ret = 0; + TRACE("(%04X, %p, %08X);\n", wDevID, lpDesc, dwFlags); if (lpDesc == NULL) { @@ -489,7 +513,11 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) MidiInDev[wDevID].startTime = 0; /* Connect our app port to the device port */ - if (snd_seq_connect_from(midiSeq, port_in, MidiInDev[wDevID].addr.client, MidiInDev[wDevID].addr.port) < 0) + EnterCriticalSection(&midiSeqLock); + ret = snd_seq_connect_from(midiSeq, port_in, MidiInDev[wDevID].addr.client, + MidiInDev[wDevID].addr.port); + LeaveCriticalSection(&midiSeqLock); + if (ret < 0) return MMSYSERR_NOTENABLED; TRACE("Input port :%d connected %d:%d\n",port_in,MidiInDev[wDevID].addr.client,MidiInDev[wDevID].addr.port); @@ -546,7 +574,9 @@ static DWORD midClose(WORD wDevID) TRACE("Stopped thread for midi-in\n"); } + EnterCriticalSection(&midiSeqLock); snd_seq_disconnect_from(midiSeq, port_in, MidiInDev[wDevID].addr.client, MidiInDev[wDevID].addr.port); + LeaveCriticalSection(&midiSeqLock); midiCloseSeq(); MidiInDev[wDevID].bufsize = 0; @@ -704,6 +734,8 @@ static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) */ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) { + int ret; + TRACE("(%04X, %p, %08X);\n", wDevID, lpDesc, dwFlags); if (lpDesc == NULL) { WARN("Invalid Parameter !\n"); @@ -750,7 +782,11 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) MidiOutDev[wDevID].midiDesc = *lpDesc; /* Connect our app port to the device port */ - if (snd_seq_connect_to(midiSeq, port_out, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port) < 0) + EnterCriticalSection(&midiSeqLock); + ret = snd_seq_connect_to(midiSeq, port_out, MidiOutDev[wDevID].addr.client, + MidiOutDev[wDevID].addr.port); + LeaveCriticalSection(&midiSeqLock); + if (ret < 0) return MMSYSERR_NOTENABLED; TRACE("Output port :%d connected %d:%d\n",port_out,MidiOutDev[wDevID].addr.client,MidiOutDev[wDevID].addr.port); @@ -785,7 +821,9 @@ static DWORD modClose(WORD wDevID) case MOD_FMSYNTH: case MOD_MIDIPORT: case MOD_SYNTH: + EnterCriticalSection(&midiSeqLock); snd_seq_disconnect_to(midiSeq, port_out, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); + LeaveCriticalSection(&midiSeqLock); midiCloseSeq(); break; default: @@ -904,8 +942,11 @@ static DWORD modData(WORD wDevID, DWORD dwParam) } break; } - if (handled) + if (handled) { + EnterCriticalSection(&midiSeqLock); snd_seq_event_output_direct(midiSeq, &event); + LeaveCriticalSection(&midiSeqLock); + } } break; default: @@ -994,7 +1035,9 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) snd_seq_ev_set_dest(&event, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); TRACE("destination %d:%d\n", MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); snd_seq_ev_set_sysex(&event, lpMidiHdr->dwBufferLength + len_add, lpNewData ? lpNewData : lpData); + EnterCriticalSection(&midiSeqLock); snd_seq_event_output_direct(midiSeq, &event); + LeaveCriticalSection(&midiSeqLock); HeapFree(GetProcessHeap(), 0, lpNewData); break; default:

1 0

Alexandre Bique : ntdll: Fixme once for NtFlushInstructionCache().
by Alexandre Julliard Dec. 16, 2013

Dec. 16, 2013

Module: wine Branch: master Commit: 5af51793136a962575867f7362690cd622182db2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5af51793136a962575867f736… Author: Alexandre Bique <bique.alexandre(a)gmail.com> Date: Fri Dec 13 00:34:10 2013 +0100 ntdll: Fixme once for NtFlushInstructionCache(). --- dlls/ntdll/process.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 88a9e41..1c9286f 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -561,11 +561,15 @@ NTSTATUS WINAPI NtFlushInstructionCache( IN LPCVOID BaseAddress, IN SIZE_T Size) { + static int once; + if (!once++) + { #ifdef __i386__ - TRACE("%p %p %ld - no-op on x86\n", ProcessHandle, BaseAddress, Size ); + TRACE("%p %p %ld - no-op on x86\n", ProcessHandle, BaseAddress, Size ); #else - FIXME("%p %p %ld\n", ProcessHandle, BaseAddress, Size ); + FIXME("%p %p %ld\n", ProcessHandle, BaseAddress, Size ); #endif + } return STATUS_SUCCESS; }

1 0

Jonathan Liu : winebuild: Use correct PATH separator on Windows.
by Alexandre Julliard Dec. 16, 2013

Dec. 16, 2013

Module: wine Branch: master Commit: 93bdde3af2a303cdc72bce2aa59b11f9c0aebd0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=93bdde3af2a303cdc72bce2aa… Author: Jonathan Liu <net147(a)gmail.com> Date: Sat Dec 14 10:02:21 2013 +1100 winebuild: Use correct PATH separator on Windows. --- tools/winebuild/utils.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index d92a731..e838165 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -39,6 +39,12 @@ #include "build.h" +#ifdef _WIN32 +# define PATH_SEPARATOR ';' +#else +# define PATH_SEPARATOR ':' +#endif + static const char **tmp_files; static unsigned int nb_tmp_files; static unsigned int max_tmp_files; @@ -319,13 +325,13 @@ struct strarray *find_tool( const char *name, const char * const *names ) if (!getenv( "PATH" )) return NULL; path = xstrdup( getenv( "PATH" )); - for (p = path, count = 2; *p; p++) if (*p == ':') count++; + for (p = path, count = 2; *p; p++) if (*p == PATH_SEPARATOR) count++; dirs = xmalloc( count * sizeof(*dirs) ); count = 0; dirs[count++] = p = path; while (*p) { - while (*p && *p != ':') p++; + while (*p && *p != PATH_SEPARATOR) p++; if (!*p) break; *p++ = 0; dirs[count++] = p;

1 0

Nikolay Sivov : msxml3: Store document url in properties so every instance could see it.
by Alexandre Julliard Dec. 16, 2013

Dec. 16, 2013

Module: wine Branch: master Commit: 40c8d6aa0a01632d19769a6409d43ef04ad9aa47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40c8d6aa0a01632d19769a640… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 16 18:52:09 2013 +0400 msxml3: Store document url in properties so every instance could see it. --- dlls/msxml3/domdoc.c | 29 ++++++++++++++++++++--------- dlls/msxml3/tests/domdoc.c | 19 ++++++++++++++++++- 2 files changed, 38 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index e3dd792..6db349c 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -86,6 +86,7 @@ typedef struct { xmlChar const* selectNsStr; LONG selectNsStr_len; BOOL XPath; + WCHAR *url; } domdoc_properties; typedef struct ConnectionPoint ConnectionPoint; @@ -131,8 +132,6 @@ struct domdoc domdoc_properties* properties; HRESULT error; - WCHAR *url; - /* IObjectWithSite */ IUnknown *site; @@ -299,6 +298,9 @@ static domdoc_properties *create_properties(MSXML_VERSION version) properties->version = version; properties->XPath = (version == MSXML4 || version == MSXML6); + /* document url */ + properties->url = NULL; + return properties; } @@ -333,6 +335,16 @@ static domdoc_properties* copy_properties(domdoc_properties const* properties) list_add_tail(&pcopy->selectNsList, &new_ns->entry); } + if (properties->url) + { + int len = strlenW(properties->url); + + pcopy->url = CoTaskMemAlloc((len+1)*sizeof(WCHAR)); + memcpy(pcopy->url, properties->url, len*sizeof(WCHAR)); + pcopy->url[len] = 0; + } + else + pcopy->url = NULL; } return pcopy; @@ -346,6 +358,7 @@ static void free_properties(domdoc_properties* properties) IXMLDOMSchemaCollection2_Release(properties->schemaCache); clear_selectNsList(&properties->selectNsList); heap_free((xmlChar*)properties->selectNsStr); + CoTaskMemFree(properties->url); heap_free(properties); } } @@ -948,7 +961,6 @@ static ULONG WINAPI domdoc_Release( IXMLDOMDocument3 *iface ) for (eid = 0; eid < EVENTID_LAST; eid++) if (This->events[eid]) IDispatch_Release(This->events[eid]); - CoTaskMemFree(This->url); release_namespaces(This); heap_free(This); } @@ -2202,15 +2214,15 @@ static HRESULT WINAPI domdoc_load( { IMoniker *mon; - CoTaskMemFree(This->url); - This->url = NULL; + CoTaskMemFree(This->properties->url); + This->properties->url = NULL; hr = create_moniker_from_url( filename, &mon); if ( SUCCEEDED(hr) ) { hr = domdoc_load_moniker( This, mon ); if (hr == S_OK) - IMoniker_GetDisplayName(mon, NULL, NULL, &This->url); + IMoniker_GetDisplayName(mon, NULL, NULL, &This->properties->url); IMoniker_Release(mon); } @@ -2282,9 +2294,9 @@ static HRESULT WINAPI domdoc_get_url( if (!url) return E_INVALIDARG; - if (This->url) + if (This->properties->url) { - *url = SysAllocString(This->url); + *url = SysAllocString(This->properties->url); if (!*url) return E_OUTOFMEMORY; @@ -3568,7 +3580,6 @@ HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document) doc->safeopt = 0; doc->cp_list = NULL; doc->namespaces = NULL; - doc->url = NULL; memset(doc->events, 0, sizeof(doc->events)); /* events connection points */ diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 48f3c17..3ff85a0 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -9560,8 +9560,9 @@ static void write_to_file(const char *name, const char *data) static void test_load(void) { - IXMLDOMDocument *doc; + IXMLDOMDocument *doc, *doc2; IXMLDOMNodeList *list; + IXMLDOMElement *elem; VARIANT_BOOL b; VARIANT src; HRESULT hr; @@ -9604,7 +9605,23 @@ static void test_load(void) bstr1 = NULL; hr = IXMLDOMDocument_get_url(doc, &bstr1); ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_get_documentElement(doc, &elem); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* create another instace for the same document, check url */ + hr = IXMLDOMElement_get_ownerDocument(elem, &doc2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_get_url(doc, &bstr2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(bstr1, bstr2), "got %s\n", wine_dbgstr_w(bstr2)); + + IXMLDOMDocument_Release(doc2); + IXMLDOMElement_Release(elem); + SysFreeString(bstr1); + SysFreeString(bstr2); /* load from a path: VT_BSTR|VT_BYREF, null ptr */ V_VT(&src) = VT_BSTR | VT_BYREF;

1 0