November 2010 - Wine-devel - list.winehq.org

Re: [PATCH] comctl32/tests: Change expect_band_content test into a macro to ensure line numbers are reported correctly on test failure.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Austin Lund <austin.lund(a)gmail.com> writes: > +#define expect_band_content(hRebar, uBand, fStylep, clrForep, clrBackp, \ > + lpTextp, iImagep, hwndChildp, cxMinChildp, cyMinChildp, cxp, hbmBackp, \ > + wIDp, cyChildp, cyMaxChildp, cyIntegralp, cxIdealp, lParamp, cxHeaderp, cxHeader_brokenp) \ > +{ \ > + CHAR buf[MAX_PATH] = "abc"; \ > + REBARBANDINFOA rb; \ > + memset(&rb, 0xdd, sizeof(rb)); \ > + rb.cbSize = REBARBANDINFOA_V6_SIZE; \ > + rb.fMask = RBBIM_BACKGROUND | RBBIM_CHILD | RBBIM_CHILDSIZE | RBBIM_COLORS \ > + | RBBIM_HEADERSIZE | RBBIM_ID | RBBIM_IDEALSIZE | RBBIM_IMAGE | RBBIM_LPARAM \ > + | RBBIM_SIZE | RBBIM_STYLE | RBBIM_TEXT; \ > + rb.lpText = buf; \ > + rb.cch = MAX_PATH; \ > + ok(SendMessageA(hRebar, RB_GETBANDINFOA, uBand, (LPARAM)&rb), "RB_GETBANDINFO failed\n"); \ > + expect_eq(rb.fStyle, fStylep, int, "%x"); \ > + expect_eq(rb.clrFore, clrForep, COLORREF, "%x"); \ > + expect_eq(rb.clrBack, clrBackp, COLORREF, "%x"); \ > + expect_eq(strcmp(rb.lpText, lpTextp), 0, int, "%d"); \ > + expect_eq(rb.iImage, iImagep, int, "%x"); \ > + expect_eq(rb.hwndChild, hwndChildp, HWND, "%p"); \ > + expect_eq(rb.cxMinChild, cxMinChildp, int, "%d"); \ > + expect_eq(rb.cyMinChild, cyMinChildp, int, "%d"); \ > + expect_eq(rb.cx, cxp, int, "%d"); \ > + expect_eq(rb.hbmBack, hbmBackp, HBITMAP, "%p"); \ > + expect_eq(rb.wID, wIDp, int, "%d"); \ > + /* the values of cyChild, cyMaxChild and cyIntegral can't be read unless the band is RBBS_VARIABLEHEIGHT */ \ > + expect_eq(rb.cyChild, cyChildp, int, "%x"); \ > + expect_eq(rb.cyMaxChild, cyMaxChildp, int, "%x"); \ > + expect_eq(rb.cyIntegral, cyIntegralp, int, "%x"); \ > + expect_eq(rb.cxIdeal, cxIdealp, int, "%d"); \ > + expect_eq(rb.lParam, (LPARAM)lParamp, LPARAM, "%ld"); \ > + ok( rb.cxHeader == cxHeaderp || broken(rb.cxHeader == cxHeader_brokenp), \ > + "expected %d for %d\n", cxHeaderp, rb.cxHeader ); \ Please don't define huge macros like that. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/4] mshtml: Don't free string that will be cleared by SafeArrayDestroy.
by Michael Stefaniuc 08 Nov '10

08 Nov '10

Hello Jacek, Jacek Caban wrote: > --- > dlls/mshtml/tests/dom.c | 1 - > 1 files changed, 0 insertions(+), 1 deletions(-) in that case "str" becomes unused and can be removed like in the attached patch. bye michael

2 1

Re: [PATCH 4/4] mshtml: Moved tid declaration to separated file.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Jacek Caban <jacek(a)codeweavers.com> writes: > Doing define/include tricks isn't perfect solution, but the current > state is even worse. > --- > dlls/mshtml/dispex.c | 93 ++--------------------------------------- > dlls/mshtml/mshtml_private.h | 94 ++--------------------------------------- > dlls/mshtml/tid.inc | 88 +++++++++++++++++++++++++++++++++++++++ > 3 files changed, 98 insertions(+), 177 deletions(-) > create mode 100644 dlls/mshtml/tid.inc Please don't create a separate file, particularly not with a non-standard extension. You can do this with a macro in mshtml_private.h. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 1/8] d3dcompiler: Add ID3D11ShaderReflectionType stub interface.
by Henri Verbeet 08 Nov '10

08 Nov '10

2010/11/7 Rico Schüller <kgbricola(a)web.de>: > --- > dlls/d3dcompiler_43/d3dcompiler_private.h | 7 ++ > dlls/d3dcompiler_43/reflection.c | 106 > +++++++++++++++++++++++++++++ > 2 files changed, 113 insertions(+), 0 deletions(-) > You're adding dead code. Also, I expect there to be no reason to for the vtbl and implementation structure to be visible outside of reflection.c.

1 0

Re: [PATCH 4/8] d3dcompiler: Add initial reflection parsing.
by Henri Verbeet 08 Nov '10

08 Nov '10

2010/11/7 Rico Schüller <kgbricola(a)web.de>: > + hr = d3dcompiler_parse_reflection(data, data_size, riid, object); > + if (FAILED(hr)) > + { > + WARN("Failed to parse shader reflection\n"); > + IUnknown_Release((IUnknown *)object); > + return hr; > + } You might as well create a function along the lines of d3dc_shader_reflection_init(), call that here, and keep the vtbl and d3dcompiler_parse_reflection() internal to reflect.c. > +static void d3dcompiler_parse_unknown(const char *data, DWORD data_size) > +{ > + const char *ptr = data; > + > + skip_dword_unknown(&ptr, data_size >> 2); > + > + return; > +} I don't think this is very useful in general, it's just going to create a lot of console spam.

1 0

Re: [PATCH 3/5] ddraw: Setup the device window in SetCooperativeLevel().
by Marvin 08 Nov '10

08 Nov '10

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=6885 Your paranoid android. === W98SE (32 bit ddrawmodes) === ddrawmodes: unhandled exception c0000005 at 004122E8 === W7PROX64 (64 bit ddrawmodes) === Timeout

1 0

Re: [PATCH] wined3d: correctly guess_card_vendor() for gallium r600 drivers
by Austin English 08 Nov '10

08 Nov '10

On Sun, Nov 7, 2010 at 2:08 PM, Brian Paterni <bpaterni(a)gmail.com> wrote: > Hello, I've been receiving a couple "unrecognized GL_VENDOR" fixme's lately and > decided to poke around wine's source. I've found that wined3d_guess_card_vendor > does not return the correct enum for people running mesa's r600g driver, and now > that r600g returns "AMD <gpu chip>" as part of openGL's renderer string, we can > easily use that to check for AMD (ATI) hardware: > > --- > dlls/wined3d/directx.c | 5 ++--- > 1 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c > index 32d2431..3908c5f 100644 > --- a/dlls/wined3d/directx.c > +++ b/dlls/wined3d/directx.c > @@ -1373,11 +1373,10 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s > if (strstr(gl_vendor_string, "ATI") > || strstr(gl_vendor_string, "Advanced Micro Devices, Inc.") > || strstr(gl_vendor_string, "X.Org R300 Project") > + || (strstr(gl_vendor_string, "X.Org") && strstr(gl_renderer, "AMD")) > || strstr(gl_renderer, "R100") > || strstr(gl_renderer, "R200") > - || strstr(gl_renderer, "R300") > - || strstr(gl_renderer, "R600") > - || strstr(gl_renderer, "R700")) > + || strstr(gl_renderer, "R300")) > return HW_VENDOR_ATI; > > if (strstr(gl_vendor_string, "Intel(R)") > -- > 1.7.2.3 Howdy Brian, You're mixing tabs and spaces. Please use consistent spacing, as the rest of the file does. -- -Austin

3 2

Where in the code does wine read fonts?
by Per Olesen 08 Nov '10

08 Nov '10

Hi! I am trying to figure out how wine reads fonts on startup but am having a little trouble. I checked out the source and found a lot of good stuff in "winex11.drv/xfont.c", but I am not sure this is actually the code, that gets executed when my wine boots. What I experience, is that wine reads the X fonts, using the fontconfig library. Is that correct? Maybe I should say *why* I am digging into the font handling in the code. When I rebuild the system fontcache (using "fc-cache"), wine suddenly gets painfully slow to boot. When I revert to the old cache I had before rebuild, it gets fast again. Listing the cache content (using "fc-list") yields the same amount of fonts before and after rebuild, so I find it strange with the extra boot time. Actually, it would be better for me to NOT have wine read the X fonts (I think). So, I tried digging in to understand it better from the code. Is there a central place in the source code I am missing, that could lead me to the lightsource :-) Regards, Per

2 1

Re: [PATCH] comctl32/tests: Change expect_band_content test into a macro to ensure line numbers are reported correctly on test failure.
by Nikolay Sivov 08 Nov '10

08 Nov '10

On 11/8/2010 13:29, Austin Lund wrote: > --- > dlls/comctl32/tests/rebar.c | 69 ++++++++++++++++++++---------------------- > 1 files changed, 33 insertions(+), 36 deletions(-) It's better to use ok_() for that, and a one line macro to pass a line number.

1 0

Re: shell32/tests: Fix IShellFolderView test failure under Windows 7.
by Vitaliy Margolen 08 Nov '10

08 Nov '10

On 11/07/2010 04:06 PM, David Hedberg wrote: > - ok(hr == S_OK, "got (0x%08x)\n", hr); > + ok(hr == S_OK || hr == E_FAIL /* Win7 */, "got (0x%08x)\n", hr); This can't be correct. It either works or it fails. Can't be both at the same time. You should look into why it's failing on Win7 and correct the test so it succeeds. Vitaliy

5 5