August 2007 - Wine-devel - list.winehq.org

Re: mshtml #2: Added HTMLWindow's IDispatch methods implementation.
by Robert Shearman 01 Aug '07

01 Aug '07

Jacek Caban wrote: > static HRESULT WINAPI HTMLWindow2_item(IHTMLWindow2 *iface, VARIANT *pvarIndex, VARIANT *pvarResult) > diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c > index 3f8131c..41f32eb 100644 > --- a/dlls/mshtml/main.c > +++ b/dlls/mshtml/main.c > @@ -51,10 +51,52 @@ DWORD mshtml_tls = 0; > > static HINSTANCE shdoclc = NULL; > > +static ITypeLib *typelib; > +static ITypeInfo *typeinfos[LAST_tid]; > + > +static const REFIID tid_ids[] = { > + &IID_IHTMLWindow2 > +}; > + > +HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo) > +{ > + HRESULT hres; > + > + if(!typelib) { > + hres = LoadRegTypeLib(&LIBID_MSHTML, 4, 0, LOCALE_SYSTEM_DEFAULT, &typelib); > This isn't thread-safe. > + if(FAILED(hres)) { > + ERR("LoadRegTypeLib failed: %08x\n", hres); > + return hres; > + } > + } > + > + if(!typeinfos[tid]) { > + hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], typeinfos+tid); > + if(FAILED(hres)) { > + ERR("GetTypeInfoOfGuid failed: %08x\n", hres); > + return hres; > + } > + } > Why not just use the IID instead of an enumeration here? I know you're trying to cache the typeinfo here, but the current implementation of typelibs makes ITypeLib_GetTypeInfoOfGuid very cheap. > + > + *typeinfo = typeinfos[tid]; > + return S_OK; > +} > + > static void thread_detach(void) > { > - thread_data_t *thread_data = get_thread_data(FALSE); > + thread_data_t *thread_data; > + > + if(typelib) { > + unsigned i; > + > + for(i=0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) > + if(typeinfos[i]) > + ITypeInfo_Release(typeinfos[i]); > + > + ITypeLib_Release(typelib); > + } > Why are you doing this from DLL_THREAD_DETACH and not DLL_PROCESS_DETACH? -- Rob Shearman

2 1

New winetest skipping test for nonexistent dll's
by Paul Vriens 01 Aug '07

01 Aug '07

Hi, I've been busy trying to come up with a solution and attached you will find 2 patches. One for 'winetest that will make sure we have specific output for dll's that are not on the system. I have made the output as close to normal test output as possible, so we don't have to patch dissect (the tool that dissects the reports). One for 'gather', the tool that translates the reports into a nice html page. There will be (in contrast with the other skip's) no visibility in the group reports yet. I'll have to figure out how to do that nicely. For now I'm assuming that if one system doesn't have a dll, all the others (same platform) don't have it at well (I know bad assumption and it will be dealt with in next revisions). (I do have another version of 'gather' which deals with the group reports but shows the whole test for all systems (same platform of course) if one or more systems have a missing dll). If we pursue this then we probably also need to change old tests as that will mean we can strip a lot of code from the tests. Comments/remarks etc.. are welcome. Cheers, Paul. diff --git a/programs/winetest/main.c b/programs/winetest/main.c index f743ffc..3c4846d 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -433,6 +433,24 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, LPTSTR lpszName, LONG_PTR lParam) { const char *tempdir = (const char *)lParam; + char dllname[MAX_PATH]; + HMODULE dll; + + /* Check if the main dll is present on this system */ + strcpy(dllname, lpszName); + *strstr(dllname, "_TEST.EXE") = 0; + + dll = LoadLibrary(dllname); + if (!dll) { + /* Here we add some information to the results file + * that indicates that the dll is not present + * on this platform. + */ + report (R_WARNING, "dll : %s is not present", dllname); + return TRUE; + } + FreeLibrary(dll); + get_subtests( tempdir, &wine_tests[nr_of_files], lpszName ); nr_of_tests += wine_tests[nr_of_files].subtest_count; nr_of_files++; Index: gather =================================================================== RCS file: /home/wine/tools/winetest/gather,v retrieving revision 1.20 diff -u -r1.20 gather --- gather 13 Mar 2007 16:10:46 -0000 1.20 +++ gather 1 Aug 2007 16:27:19 -0000 @@ -96,6 +96,9 @@ my ($digest, $unit, $test, $count, $todo, $error, $skipped, $source, $rev) = split; my $testname = "$unit:$test"; + if ($test =~ /_dll_missing/) { + $testref->{dll}->{$unit} = "missing"; + } $testref->{results}->{$testname} = [$count, $todo, $error, $skipped]; $alltests{$testname} = "http://cvs.winehq.org/cvsweb/wine/$source" . ($rev ne "-"?"#rev$rev":"") unless exists $alltests{$testname}; @@ -199,7 +202,18 @@ my ($test, $testname, $groupname) = @_; if (!exists $test->{results}->{$testname}) { - print OUT " <td class=\"note\">.</td>\n"; + my ($unit1, $test1) = split(/:/, $testname); + my $dll = $test->{dll}->{$unit1}; + if ((defined $dll) && ($dll eq "missing")) { + print OUT <<"EOF"; + <td class="skip_pass"><a + title="No tests run as $unit1.dll is not present on this system" + onMouseOver="No tests run as $unit1.dll is not present on this system" + >0</a></td> +EOF + } else { + print OUT " <td class=\"note\">.</td>\n"; + } } else { my $file = "$test->{dir}/$testname.txt"; my ($count, $todo, $error, $skipped) = @{$test->{results}->{$testname}}; @@ -223,6 +237,8 @@ } foreach my $testname (sort keys %alltests) { + next unless $testname !~ /_dll_missing/; + print OUT <<"EOF"; <tr> <td class="test"> @@ -290,6 +306,7 @@ <tbody onDblClick="clone();"> EOF foreach my $testname (sort keys %alltests) { # skip identical + next unless $testname !~ /_dll_missing/; my $digest = $group->{digests}->{$testname}; next unless defined $digest && $digest eq "differ"; print OUT <<"EOF";

2 1

Re: Add winhttp.dll.
by Vijay Kiran Kamuju 01 Aug '07

01 Aug '07

Hi Jacek, I think you can use the header I sent a while back to wine-patches for this. http://www.winehq.org/pipermail/wine-patches/2005-September/020901.html The original patch: http://www.winehq.org/pipermail/wine-patches/attachments/20050923/790dfab2/… This might require some re-work. It was rejected at that time, when I wanted to add winhttp.dll It might be of some help to you. Thanks, VJ

2 1

RPC questions
by Kai Blin 01 Aug '07

01 Aug '07

Hi folks, I will be getting into working on RPC soonish, and some of that I'd like to use for Wine. However, I don't know my way around that code so far, what would be a good starting point to tackle this? My goal is to set up a daemon that will take care of remote named pipes over smb and all of that stuff, while all that Wine needs to do is to access this daemon talking DCE-RPC. As we probably don't need to link anything, we will be able to use that daemon for other jobs, like doing netapi32 calls, etc. Where would I get started for this? Cheers, Kai -- Kai Blin WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin Samba team member http://www.samba.org/samba/team/ -- Will code for cotton.

2 1

Re: #4 pdh: Implement and test PdhAddEnglishCounter{A, W} and PdhCollectQueryDataWithTime.
by Paul Vriens 01 Aug '07

01 Aug '07

Hans Leidekker wrote: > These APIs were introduced with Vista. > > -Hans > > Changelog > Implement and test PdhAddEnglishCounter{A, W} and PdhCollectQueryDataWithTime. > > > ------------------------------------------------------------------------ > > Hi Hans, I was going through some test failures (already sent a patch for missing defines). It appears that a lot of the used strings, like "System Up Time" is depending on the locale. Some Dutch tests show "Systeem ingeschakeld" instead. Any idea how to fix that? Another thing is that "pdh.dll" is not by default present on NT4 and below so the tests have to be changed to cope with that as well. Should I have a go at that? Cheers, Paul.

3 10

32bit winelib builds in x86_64
by Michael Ost 01 Aug '07

01 Aug '07

What's the command for building a 32bit winelib .dll.so and .exe.so with wineg++ in an x86_64 environment? I am used to doing dlls with: $ wineg++ -shared DLL.spec -o DLL.dll.so ... and exes with: $ wineg++ -o APP.exe.so ... Seems I need to use "-m32" for g++, "--32" for as, and "-m elf_i386" for ld. But with all the nested calls of wineg++ and winebuild I can't figure out how to get those options passed in everywhere they are needed. Any hints? Cheers... Michael Ost

2 1

Re: Implement LockWorkstation using xdg-screensaver from explorer
by Alexandre Julliard 01 Aug '07

01 Aug '07

"Steven Edwards" <winehacker(a)gmail.com> writes: > This time in explorer.... > > With this patch, Process Explorer no longer crashes when locking the > workstation from within the application. If xdg-screensaver is not > present on the system, explorer simply returns in which case > LockWorkstion thinks it still succeeded. I still like the idea of > having our own screensaver for Desktop mode and running that when > LockWorkstation is called. If this is accepted then I will either add > a check for desktop mode to avoid the call to xdg-screensaver or write > a wine scr that only runs in Desktop mode. To be able to do that you need to send the request to the existing explorer process, not start a new one. -- Alexandre Julliard julliard(a)winehq.org

2 3

Re: [4/4] winex11.drv: draw custom dashes [try2]
by Evan Stade 31 Jul '07

31 Jul '07

On 7/30/07, Evan Stade <estade(a)gmail.com> wrote: > Hi, > > [try2] > * matched braces style of rest of file > * spread code out to make it more readable > * simplified use of gdi_to_x11_dashes > > dlls/winex11.drv/graphics.c | 3 + > dlls/winex11.drv/pen.c | 123 +++++++++++++++++++++++++++++++++++++++++-- > dlls/winex11.drv/x11drv.h | 1 > 3 files changed, 120 insertions(+), 7 deletions(-) > > -- > Evan Stade > > I am not sure how to make this patch more amenable. The gdi_to_x11_dashes function is indeed a bit unwieldy but it doesn't have all that simple a task. Does anyone have some suggestions on how to make it more acceptable? -- Evan Stade

1 0