Re: d3d8: Fix a ptrdiff_t warning on 64-bit.

2010-01-11 Thread Nicolas Le Cam
2010/1/11 Alexandre Julliard : > Nicolas Le Cam writes: > >> @@ -175,7 +175,7 @@ static DWORD d3d8_allocate_handle(struct >> d3d8_handle_table *t, void *object, enu >>          entry = t->free_entries; >>          if (entry->type != D3D8_HANDLE_FREE) >>          { >> -            ERR("Handle %u(%

Re: [PATCH] wined3d: Do not try to use not available texture stages in set_tex_op_nvr

2010-01-11 Thread Stefan Dösinger
Am 11.01.2010 um 15:11 schrieb Henri Verbeet: > 2010/1/11 Christian Costa : >> That's better but there are still "err:d3d:state_undefined Undefined state." >> errors. >> 6 in total. One for each unavailable stage. >> > That's weird, it should hit the DebugBreak() in either > Context_MarkStateDir

Re: d3drm: Merge Direct3DRMCreate with its implementation.

2010-01-11 Thread Dmitry Timoshkov
Christian Costa wrote: > I'm not again clean-up at all but this dll is almost empty and this is > likely there will be some patches preparing > further submissions. Doing some clean-up between patches does not help much. Main purpose of my patch was to replace a vtable in IDirect3DRMImpl by a p

Re: d3drm: Merge Direct3DRMCreate with its implementation.

2010-01-11 Thread Christian Costa
Dmitry Timoshkov a écrit : Christian Costa wrote: What the hell is the purpose of this patch ? Isn't the subject clear enough? Please calm down. Well yes and no. Why would you do that merge ? Direct3DRM_create is supposed to be called by Direct3DRMCreate or from class factory (wh

Re: d3drm: Merge Direct3DRMCreate with its implementation.

2010-01-11 Thread Dmitry Timoshkov
Christian Costa wrote: > What the hell is the purpose of this patch ? Isn't the subject clear enough? Please calm down. > d3drm.c is for the IDirect3DRMx objects implementations and there will > be a file for each other object. Once it's really needed you can create as much source files as yo

Re: dbghelp: merge dwarf code from ntdll/signal_x86_64.c

2010-01-11 Thread Eric Pouech
André Hentschel a écrit : Eric Pouech schrieb: André Hentschel a écrit : thanks Eric Pouech for the reviews --- dlls/dbghelp/dwarf.c | 229 +- dlls/dbghelp/dwarf.h | 15 2 files changed, 204 insertions(+), 40 deletions(-) diff --

Re: d3drm: Merge Direct3DRMCreate with its implementation.

2010-01-11 Thread Christian Costa
What the hell is the purpose of this patch ? d3drm.c is for the IDirect3DRMx objects implementations and there will be a file for each other object. Direct3DRMCreate is just an entry point and BTW many wine DirectX dlls are implemented this way because some objects can be also created using th

Re: user32: Do not allow a change of capture if the currently capture window is a menu unless explicitly specified (try2)

2010-01-11 Thread Peter Dons Tychsen
On Mon, 2010-01-11 at 14:00 -0600, Alexandre Julliard wrote: > Is there actually an app that depends on this? http://bugs.winehq.org/show_bug.cgi?id=9369 This bug requires the function to fail, but you are probably right that no-one checks the error code. I will change the patch/test to be less p

Re: user32: Do not allow a change of capture if the currently capture window is a menu unless explicitly specified (try2)

2010-01-11 Thread Peter Dons Tychsen
> Simply use wine_server_call instead of wine_server_call_err. That is my point. That will not work. The existing the error codes *should* be translated, but this new one should not. So if i use wine_server_call i would have to filter which ones to translate manually. It would also give me the p

Re: [PATCH] wined3d: Do not try to use not available texture stages in set_tex_op_nvr

2010-01-11 Thread Henri Verbeet
2010/1/11 Christian Costa : > That's better but there are still "err:d3d:state_undefined Undefined state." > errors. > 6 in total. One for each unavailable stage. > That's weird, it should hit the DebugBreak() in either Context_MarkStateDirty() or IWineD3DDeviceImpl_MarkStateDirty() when it tries t

Re: [PATCH] wined3d: Do not try to use not available texture stages in set_tex_op_nvr

2010-01-11 Thread Christian Costa
Henri Verbeet a écrit : 2010/1/6 Christian Costa : The fixmes disapear but I get tons of err:d3d:state_undefined Undefined state which is worst. Log attached. How does the attached patch work? That's better but there are still "err:d3d:state_undefined Undefined state." errors. 6 i

Re: d3d8: Fix a ptrdiff_t warning on 64-bit.

2010-01-11 Thread Alexandre Julliard
Nicolas Le Cam writes: > @@ -175,7 +175,7 @@ static DWORD d3d8_allocate_handle(struct > d3d8_handle_table *t, void *object, enu > entry = t->free_entries; > if (entry->type != D3D8_HANDLE_FREE) > { > -ERR("Handle %u(%p) is in the free list, but has type %#x

Re: MSVCRT: Handle \r at buffer boundary

2010-01-11 Thread Uwe Bonnes
> "Alexandre" == Alexandre Julliard writes: Alexandre> Uwe Bonnes writes: >> @@ -1767,6 +1771,12 @@ static int read_i(int fd, void *buf, unsigned >> int count) if (MSVCRT_fdesc[fd].wxflag & WX_TEXT) { DWORD i, j; + if >> (bufstart[num_read-1] == '\r') + { + if(pushback) +

Re: user32: Do not allow a change of capture if the currently capture window is a menu unless explicitly specified (try2)

2010-01-11 Thread Alexandre Julliard
Peter Dons Tychsen writes: >> Simply use wine_server_call instead of wine_server_call_err. > > That is my point. That will not work. The existing the error codes > *should* be translated, but this new one should not. So if i use > wine_server_call i would have to filter which ones to translate >

Re: msvcrt: Add support for sprintf_s

2010-01-11 Thread Jason Edmeades
>This doesn't seem correct to me You are right, its incomplete, but it also was based on the logic already in MSVCRT_vswprintf_s, which is just as incomplete! I'll happily just raise a bug report if the patch is insufficient, but in general all the _s special processing is missing from the printf

Re: user32: Do not allow a change of capture if the currently capture window is a menu unless explicitly specified (try2)

2010-01-11 Thread Alexandre Julliard
Peter Dons Tychsen writes: > Hello A. > > I was afraid you were going to say that! :-) > > My initial change actually did that, but then i ran into the problem > that i need the request to fail, but not set an error-code. I could > push/pop the current error code in user32 but that seemed a bit u

Re: MSVCRT: Handle \r at buffer boundary

2010-01-11 Thread Alexandre Julliard
Uwe Bonnes writes: > @@ -1767,6 +1771,12 @@ static int read_i(int fd, void *buf, unsigned int > count) > if (MSVCRT_fdesc[fd].wxflag & WX_TEXT) > { > DWORD i, j; > +if (bufstart[num_read-1] == '\r') > +{ > +if(pushback) > +

Re: dbghelp: merge dwarf code from ntdll/signal_x86_64.c

2010-01-11 Thread André Hentschel
Eric Pouech schrieb: > André Hentschel a écrit : >> thanks Eric Pouech for the reviews >> --- >> dlls/dbghelp/dwarf.c | 229 >> +- >> dlls/dbghelp/dwarf.h | 15 >> 2 files changed, 204 insertions(+), 40 deletions(-) >> >> diff --git a/dlls/db

Re: msvcrt: Add support for sprintf_s

2010-01-11 Thread André Hentschel
Chris Robinson schrieb: > This doesn't seem correct to me. According to MSDN, sprintf_s checks for > valid > formatting chars (in addition to the buffer and format arguments) and invokes > an invalid parameter handler if something bad turns up. It then returns -1 > with errno set to EINVAL if e

Re: Implement OleCreatePropertyFrame

2010-01-11 Thread Piotr Caban
Hi, In prop_sheet_proc you wrote: case PSN_APPLY: FIXME("(%p, %s, %s)\n", hwnd, "WM_NOTIFY", "PSN_APPLY"); IPropertyPage_Apply(opf->propPage); return TRUE; If I understand it correctly applying changes is fully implemented. Why there's a FIXME? Probably you wanted to us

Re: [PATCH] wined3d: Do not try to use not available texture stages in set_tex_op_nvr

2010-01-11 Thread Henri Verbeet
2010/1/6 Christian Costa : > The fixmes disapear but I get tons of err:d3d:state_undefined Undefined > state which is worst. Log attached. > How does the attached patch work? diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2aec7d6..72e1ae3 100644 --- a/dlls/wined3d/context.c +++