Re: Moving pages to/from wiki
Wed, Aug 29, 2012 16:09, André Hentschel wrote: > get the website source and do "grep -Ri cvs *" > then ignore wwn/ and news/ ... > all that should somehow bring you to http://www.winehq.org/cvs or be deleted grep -r "" * is rapidly becoming a very good friend of mine ;) I just checked http://cvs.winehq.org and sure enough, there is still a very outdated CVS repository there, but I can't find a template or a PHP applet for it, just the same links you found (most in WWN issues). I've CCed Jeremy Newman because I'm guessing the site admin would have to remove it. As for redirecting to http://www.winehq.org/cvs, since that was designed as a notice page for people trying to browse the source code, I was picturing just redirecting the links to http://source.winehq.org/git and deleting http://www.winehq.org/cvs as only WWN issues and news would still have dangling links. I don't want to remove it if there's another reason for keeping it though. - Kyle
Re: Moving pages to/from wiki
Am 29.08.2012 21:13, schrieb Kyle Auble: > I'm starting to work on moving static pages to and from the wiki, but I > wanted to ask for opinions on a few changes first: ... > 3. Do we still need the static "cvs" page, or should I just redirect any > links to it, then delete? On a related note, the WineHQ ToDo on the > wiki still claims that a browser for the old CVS source tree is > lurking on the site somewhere. Is that true, or do I need to cut that > line from the ToDo list? get the website source and do "grep -Ri cvs *" then ignore wwn/ and news/ the first lines already look like they need love: > include/htaccess.sample:RedirectPermanent /dev.shtml > http://www.winehq.org/cvs > include/htaccess.sample:RedirectPermanent /dev.html > http://www.winehq.org/cvs > include/htaccess.sample:RedirectPermanent /devstart.shtml > http://www.winehq.org/cvs > include/htaccess.sample:RedirectMatch ^/cvsweb(.*)$ > http://cvs.winehq.org/cvsweb$1 > include/htaccess.sample:RedirectMatch ^/patch.py(.*)$ > http://cvs.winehq.org/patch.py$1 > include/wwn.php:if ($file == "." or $file == ".." or $file == > "CVS" or $file == "interviews") and some things in templates all that should somehow bring you to http://www.winehq.org/cvs or be deleted -- Best Regards, André Hentschel
Re: kernel32: Return correct drive type for empty drives
Alexandre Goujon writes: > Should fix bug #17037 > I followed your advice and now, I only ask the mountmgr when needed. > --- > dlls/kernel32/volume.c | 10 +- > 1 file changed, 9 insertions(+), 1 deletion(-) This is failing here when the drive is empty: ../../../tools/runtest -q -P wine -M kernel32.dll -T ../../.. -p kernel32_test.exe.so volume.c && touch volume.ok volume.c:132: Tests skipped: can't test removing fake drive volume.c:785: Test failed: IOCTL_DVD_READ_STRUCTURE (DvdPhysicalDescriptor) failed, last error = 87 make: *** [volume.ok] Error 1 If I put a DVD in I get: volume.c:813: Test failed: IOCTL_DVD_READ_STRUCTURE should have failed Probably the tests need some fixing. -- Alexandre Julliard julli...@winehq.org
Moving pages to/from wiki
I'm starting to work on moving static pages to and from the wiki, but I wanted to ask for opinions on a few changes first: 1. Move all static IRC pages to the wiki or add info from the wiki to the static templates? The static pages only mention #winehq and don't describe guidelines, but IRC details shouldn't change much right? 2. For the static About page, some languages also have wiki versions. Do we want to keep the sparser versions currently in use, or add the more detailed information from the wiki version? Both versions seem well-written, and exist for English, Hebrew, & Spanish (I deleted the Polish wiki version; it was a duplicate). 3. Do we still need the static "cvs" page, or should I just redirect any links to it, then delete? On a related note, the WineHQ ToDo on the wiki still claims that a browser for the old CVS source tree is lurking on the site somewhere. Is that true, or do I need to cut that line from the ToDo list? 4. Since licensing tends to be really static could we just redirect the WikiLicense page to the static license page, or should they be kept separate? While I'd think it wouldn't be too hard to reword the static page's intro to include other projects, I'm leery of editing any legal-ese without asking first. By the way, the WikiLicense page says it's LGPL v2.1 in the intro text, but the included license actually looks like v2.0 of the GPL with a modification for libraries. If the wiki version of the page should stay, I'll put in a copy of v2.1 - Kyle
Re: [Tools] testbot: Add LICENSE and COPYING.LIB files.
On Wed, 29 Aug 2012, Henri Verbeet wrote: > On 29 August 2012 16:35, Francois Gouget wrote: > > --- > > > > I think this made total sense when th WineTestBot was in its own > > repository. Now maybe the COPYING.LIB and LICENSE files can be > > considered to apply to all of the Wine tools and should go to the > > top-level directory? > > > Not all of the code in tools.git is under LGPL 2.1. (And personally > I'd argue that GPL 3 is probably more appropriate for most of the > things in there anyway.) Ok. So these files are in the right place then. As for LGPL 2.1 vs. GPL 3 I'm just documentin Ge's choices. -- Francois Gouget
Re: [Tools] testbot: Add LICENSE and COPYING.LIB files.
On 29 August 2012 16:35, Francois Gouget wrote: > --- > > I think this made total sense when th WineTestBot was in its own > repository. Now maybe the COPYING.LIB and LICENSE files can be > considered to apply to all of the Wine tools and should go to the > top-level directory? > Not all of the code in tools.git is under LGPL 2.1. (And personally I'd argue that GPL 3 is probably more appropriate for most of the things in there anyway.)
Re: Wine bot results
Hi Jacek, -- From: "Jacek Caban" Sent: Wednesday, August 29, 2012 1:16 AM To: "Alistair Leslie-Hughes" Cc: Subject: Re: Wine bot results This VariantClear call attempts to free uninitialized VARIANT instance. You probably meant VariantInit(). Thanks, it works on all systems now. Best Regards Alistair Leslie-Hughes
Re: d3dx9: ID3DXConstantTable
On 28.08.2012 10:50, Henri Verbeet wrote:
On 28 August 2012 09:12, Rico Schüller wrote:
3. The wine_todo should be fixed in the test. Is there a way to disable them
to show up, when running e.g. "wine d3dx9_36_test.exe.so shader"? It's a bit
annoying when you search for your own failing tests. Well I could comment
out the tests, but that's also not a very fine solution.
You can set WINETEST_PLATFORM=wine, but the easiest is probably to
just do "make shader.ok" instead of trying to run the test manually.
Well, I found an other way, fixing the test seems also a solution :-) .
But I stumble over a problem:
How could I create shader variables which uses D3DXRS_INT4 or
D3DXRS_BOOL as register set? My goal is to check different combinations
of the RegisterSet and the Type (e.g. D3DXRS_FLOAT4 and D3DXPT_FLOAT,
D3DXRS_INT4 and D3DXPT_FLOAT, D3DXRS_BOOL and D3DXPT_FLOAT, D3DXRS_INT4
and D3DXPT_INT, D3DXRS_BOOL and D3DXPT_INT, ...). I have an improved
version of set_float_matrix but I've no glue how to check if the
assumption is correct, it fixes one todo but I'd like to test the rest
if possible. Creating variables with D3DXRS_FLOAT4 or D3DXRS_SAMPLER is
no problem. Anyone an idea?
Attached is a patch. I changed some more stuff (not only the
set_float_matrix function), but the main goal is a test for that one.
I'd also be happy if someone has some criticism or suggestions to the
rest in the patch.
Cheers
Rico
diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h
index ea7b401..a0ad561 100644
--- a/dlls/d3dx9_36/d3dx9_36_private.h
+++ b/dlls/d3dx9_36/d3dx9_36_private.h
@@ -93,4 +93,10 @@ const char *debug_d3dxparameter_class(D3DXPARAMETER_CLASS c)
DECLSPEC_HIDDEN;
const char *debug_d3dxparameter_type(D3DXPARAMETER_TYPE t) DECLSPEC_HIDDEN;
const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r)
DECLSPEC_HIDDEN;
+/* parameter type conversion helpers */
+INT get_int(D3DXPARAMETER_TYPE type, LPCVOID data) DECLSPEC_HIDDEN;
+FLOAT get_float(D3DXPARAMETER_TYPE type, LPCVOID data) DECLSPEC_HIDDEN;
+inline BOOL get_bool(LPCVOID data) DECLSPEC_HIDDEN;
+void set_number(LPVOID outdata, D3DXPARAMETER_TYPE outtype, LPCVOID indata,
D3DXPARAMETER_TYPE intype) DECLSPEC_HIDDEN;
+
#endif /* __WINE_D3DX9_36_PRIVATE_H */
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 7463742..f3a5549 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -847,90 +847,6 @@ static void free_effect_compiler(struct
ID3DXEffectCompilerImpl *compiler)
}
}
-static INT get_int(D3DXPARAMETER_TYPE type, LPCVOID data)
-{
-INT i;
-
-switch (type)
-{
-case D3DXPT_FLOAT:
-i = *(FLOAT *)data;
-break;
-
-case D3DXPT_INT:
-i = *(INT *)data;
-break;
-
-case D3DXPT_BOOL:
-i = *(BOOL *)data;
-break;
-
-default:
-i = 0;
-FIXME("Unhandled type %s. This should not happen!\n",
debug_d3dxparameter_type(type));
-break;
-}
-
-return i;
-}
-
-inline static FLOAT get_float(D3DXPARAMETER_TYPE type, LPCVOID data)
-{
-FLOAT f;
-
-switch (type)
-{
-case D3DXPT_FLOAT:
-f = *(FLOAT *)data;
-break;
-
-case D3DXPT_INT:
-f = *(INT *)data;
-break;
-
-case D3DXPT_BOOL:
-f = *(BOOL *)data;
-break;
-
-default:
-f = 0.0f;
-FIXME("Unhandled type %s. This should not happen!\n",
debug_d3dxparameter_type(type));
-break;
-}
-
-return f;
-}
-
-static inline BOOL get_bool(LPCVOID data)
-{
-return (*(DWORD *)data) != 0;
-}
-
-static void set_number(LPVOID outdata, D3DXPARAMETER_TYPE outtype, LPCVOID
indata, D3DXPARAMETER_TYPE intype)
-{
-TRACE("Changing from type %i to type %i\n", intype, outtype);
-
-switch (outtype)
-{
-case D3DXPT_FLOAT:
-*(FLOAT *)outdata = get_float(intype, indata);
-break;
-
-case D3DXPT_BOOL:
-*(BOOL *)outdata = get_bool(indata);
-break;
-
-case D3DXPT_INT:
-*(INT *)outdata = get_int(intype, indata);
-break;
-
-default:
-FIXME("Error converting to type %i\n", outtype);
-*(INT *)outdata = 0;
-break;
-}
-}
-
static void get_vector(struct d3dx_parameter *param, D3DXVECTOR4 *vector)
{
UINT i;
diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c
index 33b86f6..cdfca86 100644
--- a/dlls/d3dx9_36/shader.c
+++ b/dlls/d3dx9_36/shader.c
@@ -1122,34 +1122,23 @@ static HRESULT set_vector_array(ID3DXConstantTable
*iface, IDirect3DDevice9 *dev
return D3D_OK;
}
-static HRESULT set_float_matrix(FLOAT *matrix, const D3DXCONSTANT_DESC *desc,
-UINT row_offset, UINT column_offset, UINT
rows, UINT columns,
-const void *data, D3DXPAR
