December 2009 - Wine-Devel - list.winehq.org

Re: qedit: Implement partially the Sample Grabber filter
by Rob Shearman Dec. 26, 2009

Dec. 26, 2009

2009/12/23 Paul Chitescu <paulc(a)voip.null.ro>: > Changelog: > qedit: Implement partially the Sample Grabber filter > > The IMediaPosition, IMediaSeeking and IQualityControl interfaces are currently > not implemented at all. No programs I've tested tried to query them though. > > Buffering of samples is also not implemented yet, applications usually install > an ISampleGrabberCB callback. Thread-safety is non-existent in your newly written code. DirectShow uses multiple threads so I would say thread-safety is a requirement, not a nice-to-have. -- Rob Shearman

1 0

Re: Acting as advisor for wcmd-uplift project?
by Peter Dons Tychsen Dec. 25, 2009

Dec. 25, 2009

On Tue, 2009-12-22 at 15:36 -0600, Austin English wrote: > Sure. FWIW, I'm working on some AutoHotKey/Appinstall tests for cmd, > but it's a bit difficult, since the only way to capture the stdout is > to pipe it to a file first. Hey, i think a test suite for cmd is an excellent idea, and is surely what is needed to lift the quality of this module. However, i think using AutoHotKey in an external script might not be the optimal solution. Why not place the test in the source tree along with all of the other tests. Of course this requires the tests to be run from a C based file and not a AHK file, as i doubt that AJ wants AHK in git. It would however mean that one could add tests for all of the other command line utility programs much easier (not possible now at all). I don't really see "cmd" as an external tool but and integrated part of the Wine product. Therefore i think these tests belong in the main git tree. In any case, tests are better than no tests! (just to state the obvious :-)) /pedro

2 1

Re: [3/5] WineD3D: Set WINED3D_BUFFER_CREATEBO in buffer_init
by Henri Verbeet Dec. 24, 2009

Dec. 24, 2009

2009/12/22 Stefan Dösinger <stefan(a)codeweavers.com>: > + conv = ((FVF & WINED3DFVF_POSITION_MASK) == WINED3DFVF_XYZRHW ) || (FVF & (WINED3DFVF_DIFFUSE | WINED3DFVF_SPECULAR)); > hr = buffer_init(object, This, Size, Usage, WINED3DFMT_VERTEXDATA, > - Pool, GL_ARRAY_BUFFER_ARB, NULL, parent, parent_ops); > + Pool, GL_ARRAY_BUFFER_ARB, NULL, parent, parent_ops, conv); This looks questionable, we use the FVF to determine that the buffer is going to need conversion, but don't pass that FVF to the buffer itself? Shouldn't this just use the existing code in buffer.c to determine when we need conversion in the first place, and just drop the VBO when the overhead becomes too large? Note that if we have EXT_vertex_array_bgra we don't need conversion for the color data in the first place.

3 3

Re: [PATCH 2/5] wined3d: Focus the focus window.
by Stefan Dösinger Dec. 24, 2009

Dec. 24, 2009

Am 22.12.2009 um 18:32 schrieb Henri Verbeet: > + SetFocus(This->focus_window); > + Is this correct for windowed rendering as well?

2 1

Re: [winspool 2/6] Move the dlopen of libcups to a separate function, allowing CUPS to be used prior to the full on loading of CUPS printers.
by Detlef Riekenberg Dec. 24, 2009

Dec. 24, 2009

Hi Jeremy What is your reason for your work in winspool.drv? What are your plans? Even if the Patchset changes some things, it's not the correct location to do that. winspool.drv must not do anything with the registry or the driver files. winspool.drv must not use cups at all wineps.drv must not use cups at all That all belong to a print provider, together with a print monitor. To make our live easy, the printprovider and printmonitor for CUPS and LPR will be integrated into localspl.dll (windows is using seperate provider/monitor: See inetpp.dll and lprmon.dll with friends) I have a Patch here for moving AddPrinter to localspl, that address most of your changes, but a small peace of code is only in my test app and not in the Patch yet (get default DEVMODEW from the Driver) An important issue is, that we store DEVMODEA in the registry. Code is there to handle that, bu it failed on julliards machine. My localspl.dll has a cups.c, but that need more work(i can't continue before mid januar). And IMHO, using wine_get_unix_file_name in High-level dlls is wrong by design. W2k pro and XP pro have driver directories only for supported environments. (Servers are different) When you think, that you need the driver directories, they can be created with wine.inf Please avoid ANSI strings in new code. (strdupWtoA should go away) -- By by ... Detlef ___________________________________________________________ Preisknaller: WEB.DE DSL Flatrate für nur 16,99 Euro/mtl.! http://produkte.web.de/go/02/

3 2

Re: gdiplus: Add stub for GdipIsVisibleClipEmpty
by Alexandre Julliard Dec. 24, 2009

Dec. 24, 2009

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > Changelog: > gdiplus: Add stub for GdipIsVisibleClipEmpty You might as well implement it right away, it should be fairly trivial. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [1/4] wineboot: Generate the HKCU\Volatile Environment registry key.
by Alexandre Julliard Dec. 24, 2009

Dec. 24, 2009

Andrew Nguyen <arethusa26(a)gmail.com> writes: > @@ -453,7 +453,6 @@ HKLM,Software\Microsoft\DirectPlay\Service Providers\Serial Connection For Direc > HKLM,Software\Microsoft\DirectPlay\Service Providers\Serial Connection For DirectPlay,"Path",,"dpmodemx.dll" > > [Environment] > -HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"APPDATA",,"%16410%" > HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"ComSpec",0x00020000,"%11%\cmd.exe" > HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"LOCALAPPDATA",,"%16412%" > HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"PATH",0x00020002,"%11%;%10%;%11%\wbem" Looks good, but you should do the same thing for LOCALAPPDATA. -- Alexandre Julliard julliard(a)winehq.org

1 0

<kein Betreff>
by Detlef Riekenberg Dec. 24, 2009

Dec. 24, 2009

___________________________________________________________ Preisknaller: WEB.DE DSL Flatrate für nur 16,99 Euro/mtl.! http://produkte.web.de/go/02/

1 0

Re: [PATCH 1/2] comctl32/updown: Don't update buddy text if it's the same.
by Paul Vriens Dec. 24, 2009

Dec. 24, 2009

On 12/22/2009 10:43 PM, Nikolay Sivov wrote: > Don't update buddy text if it's the same. > > There's at least one application that depends on this behavior: > http://bugs.winehq.org/show_bug.cgi?id=18574 > > This bug is closed cause crash no longer occurs in 1.1.35 due > a regression it contains, the real problem is fixed by this patch. Hi Nikolay, This one introduces a test failure on NT4 but I guess it's due to comctl32 4.72 and not the OS. NT4/4.72 sends a WM_SETTEXT instead of WM_GETTEXT (just tested, it's the only message). Could you have a look? The NT4 boxes at winetestbot.geldorp.nl have this issue. -- Cheers, Paul.

2 4

Re: [PATCH] Replace builtin WineFile Execute Dialog with standard RunFileDialog
by Dmitry Timoshkov Dec. 24, 2009

Dec. 24, 2009

"Steven Edwards" <winehacker(a)gmail.com> wrote: > - Removed the LoadLibrary calls in favor of GetModuleHandle as suggested > by Paul Vriens > - Match the bad formating of the rest of the file Avoiding a needless renaming of ID_EXECUTE to ID_RUN would make the patch much smaller. Also avoiding useless typedef, making WineFile_OnRun() static, using correct casts, avoiding hungarian notation and magic flags would make the patch slightly cleaner. -- Dmitry.

2 1

Re: winefile - replace Run/Execute dialog with standard Shell32 RunFileDlg
by Paul Vriens Dec. 23, 2009

Dec. 23, 2009

On 12/23/2009 07:08 PM, Steven Edwards wrote: > + hShell32 = LoadLibraryW(wszShell32); Isn't shell32 already available (it's imported, see Makefile.in)? If so a GetModuleHandleW() would suffice. -- Cheers, Paul.

2 1

trivial cmd test suite
by Dan Kegel Dec. 23, 2009

Dec. 23, 2009

http://kegel.com/wine/sweng/2010/#tests now points to a trivial test suite for cmd that is currently driven by a shell script (so on windows you need to install cygwin). Later I'll replace the shell script with a C program that bundles the test data into the executable to allow its use in WineTestBot and winetest. (I'm away from my office, so I haven't tested it on Wine yet.) Austin also has a small test for cmd in http://code.google.com/p/winezeug/source/browse/trunk/appinstall/scripts/cm… The main difference between the two is that people writing tests have to do lots of escaping in Austin's (because his test data is inline in the script) but not in mine (because test data is stored in external files during authoring; it will be packed into the executable later when I translate this into C). - Dan

1 0

Patch for mmdevapi/tests/dependency.c
by Paul Vriens Dec. 23, 2009

Dec. 23, 2009

Hi Maarten, Your patch to fix the test failure for boxes with no soundcard was not committed (yet?). Would the following patch be ok? It also includes more cleanup. -- Cheers, Paul.

1 0

Parser for cmd language?
by Dan Kegel Dec. 23, 2009

Dec. 23, 2009

There are lots of bugs filed for little (or big) problems in wine's cmd that involve parsing the command language: 21047 cmd does not handle for %%a in ('command') 21046 cmd does not handle all operators in 'if' command 20161 cmd can't handle echo commands containing quotes and redirection 19784 cmd doesn't handle ( ) scoping; breaks firefox build 18712 cmd: "if defined ... " command crashes. 18407 cmd.exe: set command seems broken 18346 cmd does not support the "^" escape character 18057 cmd.exe: mishandled quoted built-in commands with parameters (programs/cmd/wcmdmain.c: has_space==1 && opt_s==0) 15359 cmd's "for" command doesn't handle /F. Breaks msysgit, firefox build. The existing parser in cmd is pretty weak. I wonder if it might not be time to write a new parser -- either using some parser generator tool, or more likely, a plain old recursive descent parser -- that can handle the language better. Also, some of the builtins need to be split out into separate executables, see e.g. 18059 - Unity Indie Trial exits because attrib.exe is missing (which might relax the requirements on the parser inside cmd slightly)

5 21

Re: [1/5] WineD3D: Revert the GL usage confusion
by Roderick Colenbrander Dec. 23, 2009

Dec. 23, 2009

On Tue, Dec 22, 2009 at 4:51 PM, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > We had a discussion in wine-devel a few days ago about which GL usage is better. The red book also agrees with the GL wiki, but the GL 3.0 spec uses the confusing language the extension used. > > In my performance testing there is no difference, which suggests that this is a rather academic issue, unless you happen to run a game that is exactly hitting your card's bus transfer limits and/or video memory limits, but not the CPU and GPU ALU performance limits. > I'm not convinced the code should be changed back. All docs mention to use DYNAMIC_DRAW. On some implementations there might be a difference. I don't see a reason to change it. Did you get a response on the question you submitted to opengl.org? From what I understood the main difference between STREAM_DRAW and DYNAMIC_DRAW is that in case of dynamic, system memory which can be accessed using DMA is used and else this guarantee isn't given. I would keep it at the value which is correct as indicated by all documentation. If you want to change it, tests should be carried out on different drivers and GPUs OR wait for the feedback from opengl.org/ Roderick

2 2

Re: [2/5] WineD3D: Use unload instead of duplicating buffer remove code
by Henri Verbeet Dec. 23, 2009

Dec. 23, 2009

2009/12/22 Stefan Dösinger <stefan(a)codeweavers.com>: > - HeapFree(GetProcessHeap(), 0, This->conversion_shift); > + IWineD3DBuffer_UnLoad(iface); > + This->flags &= ~WINED3D_BUFFER_CREATEBO; UnLoad() doesn't free "conversion_shift".

2 1

Status check for patches 56770/56772
by Nathan Gallaher Dec. 22, 2009

Dec. 22, 2009

Seeing if there was anything I can do to help either of these patches move along. Don't want them to get lost. ~Nate

2 1

Re: gdiplus: Implement GdipGet/SetStringFormatMeasurableCharacterRanges.
by Vincent Povirk Dec. 22, 2009

Dec. 22, 2009

> + format->character_ranges = GdipAlloc(rangeCount * sizeof(CharacterRange)); > + if (!format->character_ranges) > + return OutOfMemory; > > - return NotImplemented; > + memcpy(format->character_ranges, ranges, sizeof(CharacterRange) * rangeCount); > + format->range_count = rangeCount; > + > + return Ok; > } Won't this leak memory if I set it twice? -- Vincent Povirk

1 0

Re: [2/4] imagehlp/tests: Add tests for adding/removing multiple certificates
by Paul Vriens Dec. 22, 2009

Dec. 22, 2009

On 12/04/2009 05:11 PM, Owen Rudge wrote: > --- > dlls/imagehlp/tests/integrity.c | 68 > +++++++++++++++++++++++++++++++-------- > 1 files changed, 54 insertions(+), 14 deletions(-) > > Hi Owen, This test fails on Win95 but only because the size of the dll is not aligned on a 16byte boundary. Using a different dll on XP for this test (my XP box has 36,921 for imeshare.dll for example) also throws up an error. Would something like this be ok: file_size_orig = get_file_size(); + if (file_size_orig % 16 != 0) + { + trace("We need to adjust the file size\n"); + file_size_orig = ((file_size_orig / 16) + 1) * 16; + } Does anybody know if '16' is indeed the alignment needed? -- Cheers, Paul.

2 3

Re: advapi32/tests: Fix test crash in Wine
by Nikolay Sivov Dec. 22, 2009

Dec. 22, 2009

On 12/22/2009 20:09, Vladimir Pankratov wrote: > Hello all. > > Fixed test crash in Wine. > > changed files: > dlls/advapi32/tests/eventlog.c > > Thanks. Looks like you're hiding a real problem. BTW, I don't see any crashes on Wine in test page. How did you test it?

2 1

Re: [1/2] wininet: Always set last error in HttpSendRequest{,Ex}.
by Paul Vriens Dec. 22, 2009

Dec. 22, 2009

On 12/21/2009 11:13 AM, Hans Leidekker wrote: > + SetLastError(0xdeadbeef); > r = HttpSendRequest(hr, NULL, 0, NULL, 0); > + error = GetLastError(); > ok(r, "HttpSendRequest failed\n"); > + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); Hi Hans, This one introduces 5 (sometimes extra) failures on Win98/WinMe: http://test.winehq.org/data/tests/wininet:http.html Not all test_basic_request() fail btw: test_basic_request(si.port, "GET", "/test1"); /* FAILS */ test_basic_request(si.port, "POST", "/test5"); /* FAILS */ test_basic_request(si.port, "RPC_IN_DATA", "/test5"); /* SUCCEEDS */ test_basic_request(si.port, "RPC_OUT_DATA", "/test5"); /* SUCCEEDS */ test_basic_request(si.port, "GET", "/test6"); /* FAILS */ test_basic_request(si.port, "GET", "/testF"); /* FAILS */ test_basic_request(si.port, "GET", "/quit"); /* FAILS */ For simplicity we could just add a broken() although that's not a 100% correct. Or only use broken() when dealing with GEt/POST? Thoughts? -- Cheers, Paul.

1 0

Re: mshtml: Added JavaScript tests architecture and simple tests.
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Jacek Caban <jacek(a)codeweavers.com> writes: > --- > dlls/mshtml/tests/Makefile.in | 2 + > dlls/mshtml/tests/jstest.html | 20 ++ > dlls/mshtml/tests/rsrc.rc | 20 ++ > dlls/mshtml/tests/script.c | 735 > ++++++++++++++++++++++++++++++++++++++++- > 4 files changed, 759 insertions(+), 18 deletions(-) > create mode 100644 dlls/mshtml/tests/jstest.html > create mode 100644 dlls/mshtml/tests/rsrc.rc It doesn't work here: ../../../tools/runtest -q -P wine -M mshtml.dll -T ../../.. -p mshtml_test.exe.so script.c && touch script.ok 0[157e88]: IMM32: InitKeyboardLayout, aKeyboardLayout=04090409, sCodePage=1252, sIMEProperty=00090000 0[157e88]: IMM32: InitKeyboardLayout, aKeyboardLayout=04090409, sCodePage=1252, sIMEProperty=00090000 0[157e88]: file wine:res://Z:/home/julliard/wine/wine/dlls/mshtml/tests/mshtml_test.exe/jstest.html, line 5: ReferenceError: external is not defined -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: tools/widl: Split expr_int_const off from expr
by Rob Shearman Dec. 21, 2009

Dec. 21, 2009

2009/6/28 Gerald Pfeifer <gerald(a)pfeifer.com>: > diff --git a/tools/widl/parser.y b/tools/widl/parser.y > index c2f1abc..01aa060 100644 > --- a/tools/widl/parser.y > +++ b/tools/widl/parser.y > @@ -622,56 +633,54 @@ m_expr: { $$ = make_expr(EXPR_VOID); } > | expr > ; > > -expr: aNUM { $$ = make_exprl(EXPR_NUM, $1); } > - | aHEXNUM { $$ = make_exprl(EXPR_HEXNUM, $1); } > +expr: expr_int_const > | aDOUBLE { $$ = make_exprd(EXPR_DOUBLE, $1); } > + | '-' aDOUBLE { $$ = make_exprd(EXPR_DOUBLE, -($2)); } This is covered by the production for the binary minus operator that already exists, so I'm not sure what you're trying to achieve here. > | tFALSE { $$ = make_exprl(EXPR_TRUEFALSE, 0); } > - | tNULL { $$ = make_exprl(EXPR_NUM, 0); } > | tTRUE { $$ = make_exprl(EXPR_TRUEFALSE, 1); } > | aSTRING { $$ = make_exprs(EXPR_STRLIT, $1); } > | aWSTRING { $$ = make_exprs(EXPR_WSTRLIT, $1); } > - | aIDENTIFIER { $$ = make_exprs(EXPR_IDENTIFIER, $1); } > | expr '?' expr ':' expr { $$ = make_expr3(EXPR_COND, $1, $3, $5); } > | expr LOGICALOR expr { $$ = make_expr2(EXPR_LOGOR, $1, $3); } > | expr LOGICALAND expr { $$ = make_expr2(EXPR_LOGAND, $1, $3); } > - | expr '|' expr { $$ = make_expr2(EXPR_OR , $1, $3); } > - | expr '^' expr { $$ = make_expr2(EXPR_XOR, $1, $3); } > - | expr '&' expr { $$ = make_expr2(EXPR_AND, $1, $3); } > | expr EQUALITY expr { $$ = make_expr2(EXPR_EQUALITY, $1, $3); } > | expr INEQUALITY expr { $$ = make_expr2(EXPR_INEQUALITY, $1, $3); } > | expr '>' expr { $$ = make_expr2(EXPR_GTR, $1, $3); } > | expr '<' expr { $$ = make_expr2(EXPR_LESS, $1, $3); } > | expr GREATEREQUAL expr { $$ = make_expr2(EXPR_GTREQL, $1, $3); } > | expr LESSEQUAL expr { $$ = make_expr2(EXPR_LESSEQL, $1, $3); } > - | expr SHL expr { $$ = make_expr2(EXPR_SHL, $1, $3); } > - | expr SHR expr { $$ = make_expr2(EXPR_SHR, $1, $3); } > - | expr '+' expr { $$ = make_expr2(EXPR_ADD, $1, $3); } > - | expr '-' expr { $$ = make_expr2(EXPR_SUB, $1, $3); } > - | expr '%' expr { $$ = make_expr2(EXPR_MOD, $1, $3); } > - | expr '*' expr { $$ = make_expr2(EXPR_MUL, $1, $3); } > - | expr '/' expr { $$ = make_expr2(EXPR_DIV, $1, $3); } > | '!' expr { $$ = make_expr1(EXPR_LOGNOT, $2); } > - | '~' expr { $$ = make_expr1(EXPR_NOT, $2); } > - | '+' expr %prec POS { $$ = make_expr1(EXPR_POS, $2); } > - | '-' expr %prec NEG { $$ = make_expr1(EXPR_NEG, $2); } > | '&' expr %prec ADDRESSOF { $$ = make_expr1(EXPR_ADDRESSOF, $2); } > | '*' expr %prec PPTR { $$ = make_expr1(EXPR_PPTR, $2); } > | expr MEMBERPTR aIDENTIFIER { $$ = make_expr2(EXPR_MEMBER, make_expr1(EXPR_PPTR, $1), make_exprs(EXPR_IDENTIFIER, $3)); } > | expr '.' aIDENTIFIER { $$ = make_expr2(EXPR_MEMBER, $1, make_exprs(EXPR_IDENTIFIER, $3)); } > | '(' type ')' expr %prec CAST { $$ = make_exprt(EXPR_CAST, $2, $4); } > - | tSIZEOF '(' type ')' { $$ = make_exprt(EXPR_SIZEOF, $3, NULL); } > | expr '[' expr ']' { $$ = make_expr2(EXPR_ARRAY, $1, $3); } > - | '(' expr ')' { $$ = $2; } > ; > > expr_list_int_const: expr_int_const { $$ = append_expr( NULL, $1 ); } > | expr_list_int_const ',' expr_int_const { $$ = append_expr( $1, $3 ); } > ; > > -expr_int_const: expr { $$ = $1; > - if (!$$->is_const) > - error_loc("expression is not an integer constant\n"); > - } > +expr_int_const: aNUM { $$ = make_exprl(EXPR_NUM, $1); } > + | aHEXNUM { $$ = make_exprl(EXPR_HEXNUM, $1); } > + | tNULL { $$ = make_exprl(EXPR_NUM, 0); } > + | aIDENTIFIER { $$ = make_exprs(EXPR_IDENTIFIER, $1); } aIDENTIFIER isn't necessarily a constant expression. > + | '~' expr_int_const { $$ = make_expr1(EXPR_NOT, $2); } > + | '+' expr_int_const %prec POS { $$ = make_expr1(EXPR_POS, $2); } > + | '-' expr_int_const %prec NEG { $$ = make_expr1(EXPR_NEG, $2); } > + | expr_int_const SHL expr_int_const { $$ = make_expr2(EXPR_SHL, $1, $3); } > + | expr_int_const SHR expr_int_const { $$ = make_expr2(EXPR_SHR, $1, $3); } > + | expr_int_const '+' expr_int_const { $$ = make_expr2(EXPR_ADD, $1, $3); } > + | expr_int_const '-' expr_int_const { $$ = make_expr2(EXPR_SUB, $1, $3); } > + | expr_int_const '%' expr_int_const { $$ = make_expr2(EXPR_MOD, $1, $3); } > + | expr_int_const '*' expr_int_const { $$ = make_expr2(EXPR_MUL, $1, $3); } > + | expr_int_const '/' expr_int_const { $$ = make_expr2(EXPR_DIV, $1, $3); } > + | expr_int_const '|' expr_int_const { $$ = make_expr2(EXPR_OR , $1, $3); } > + | expr_int_const '^' expr_int_const { $$ = make_expr2(EXPR_XOR, $1, $3); } > + | expr_int_const '&' expr_int_const { $$ = make_expr2(EXPR_AND, $1, $3); } Using "expr_int_const" instead of "expr" here prevents a many forms of expressions from being parsed. > + | tSIZEOF '(' type ')' { $$ = make_exprt(EXPR_SIZEOF, $3, NULL); } > + | '(' expr ')' { $$ = $2; } > ; > > expr_const: expr { $$ = $1; It looks like you'll have to find another way of fixing the issue you are trying to fix. -- Rob Shearman

3 2

Re: qedit.dll: Add minimal stubs for NullRenderer and SampleGrabber
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Paul Chitescu <paulc(a)voip.null.ro> writes: > Changelog: > qedit.dll: Add minimal stubs for NullRenderer and SampleGrabber. > > It doesn't make much sense to break this patch in two since most applications > connect a SampleGrabber to a NullRenderer to capture frames. That doesn't mean you can't split the patch. > +#define DEF_COMMON(iface)\ > +static ULONG WINAPI NullRenderer_ ## iface ## _AddRef(iface *ptr)\ > +{\ > + return InterlockedIncrement(&GET_THIS(ptr,iface)->refCount);\ > +}\ > +static ULONG WINAPI NullRenderer_ ## iface ## _Release(iface *ptr)\ > +{\ > + NR_Impl *This = GET_THIS(ptr,iface);\ > + ULONG refCount = InterlockedDecrement(&This->refCount);\ > + if (refCount == 0) \ > + {\ > + NullRenderer_cleanup(This);\ > + CoTaskMemFree(This);\ > + return 0;\ > + }\ > + return refCount;\ > +}\ > +static HRESULT WINAPI NullRenderer_ ## iface ## _QueryInterface(iface *ptr, REFIID riid, void **ppvObject)\ > +{\ > + return NullRenderer_query(GET_THIS(ptr,iface), riid, ppvObject);\ > +} > + > +/* Macro to put common IUnknown pointers in interface's vtable */ > +#define VTBL_COMMON(iface)\ > +NullRenderer_ ## iface ## _QueryInterface,\ > +NullRenderer_ ## iface ## _AddRef,\ > +NullRenderer_ ## iface ## _Release, Please don't add ugly macros like those, spell things out explicitly. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH 3/4] kernel32/path: Fix last error in SearchPathA/W with tests
by Paul Vriens Dec. 21, 2009

Dec. 21, 2009

On 12/21/2009 02:32 AM, Nikolay Sivov wrote: > Fix last error in SearchPathA/W with tests > Hi Nikolay, Any reason all tests are relying on both the A- and W-version being available? SearchPathA is implemented on Win98. SearchPathW is exported but not implemented. This means the current tests will fail on Win98 for example: path.c:1490: Test failed: Expected ERROR_INVALID_PARAMETER, got 2 path.c:1497: Test failed: Expected ERROR_INVALID_PARAMETER, got 78 path.c:1504: Test failed: Expected ERROR_INVALID_PARAMETER, got 78 So SearchPathA returns something different for the last error and the SearchPathW tests already fail because GetWindowsDirectoryW() is not implemented (next to SearchPathW itself not being implemented of course). -- Cheers, Paul.

2 3