May 2006 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Implement IWineD3DSurface:: IsLost and Restore.
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: 08dc9e003de52c7e2e187dec1abd0d025e227419 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=08dc9e003de52c7e2e187de… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 9 18:47:28 2006 +0200 wined3d: Implement IWineD3DSurface::IsLost and Restore. --- dlls/wined3d/surface.c | 14 ++++++++++---- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bb5d070..e6fc8cc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1698,13 +1698,19 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetFl } HRESULT WINAPI IWineD3DSurfaceImpl_IsLost(IWineD3DSurface *iface) { - FIXME("This is unimplemented for now(d3d7 merge)\n"); - return WINED3DERR_INVALIDCALL; + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + TRACE("(%p)\n", This); + + return This->Flags & SFLAG_LOST ? DDERR_SURFACELOST : WINED3D_OK; } HRESULT WINAPI IWineD3DSurfaceImpl_Restore(IWineD3DSurface *iface) { - FIXME("This is unimplemented for now(d3d7 merge)\n"); - return WINED3DERR_INVALIDCALL; + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + TRACE("(%p)\n", This); + + /* So far we don't lose anything :) */ + This->Flags &= ~SFLAG_LOST; + return WINED3D_OK; } HRESULT WINAPI IWineD3DSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dstx, DWORD dsty, IWineD3DSurface *Source, RECT *rsrc, DWORD trans) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 980ad32..efdafd1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -855,6 +855,7 @@ #define SFLAG_DYNLOCK 0x0800 /* Surf #define SFLAG_DYNCHANGE 0x1800 /* Surface contents are changed very often, implies DYNLOCK */ #define SFLAG_DCINUSE 0x2000 /* Set between GetDC and ReleaseDC calls */ #define SFLAG_NEWDC 0x4000 /* To inform LockRect about a new dc */ +#define SFLAG_LOST 0x8000 /* Surface lost flag for DDraw */ /* In some conditions the surface memory must not be freed: * SFLAG_OVERSIZE: Not all data can be kept in GL

1 0

Ivan Gyurdiev : wined3d: Share get_opcode.
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: 1d0c67239311d5b3cca4a49175b627d22e66c700 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1d0c67239311d5b3cca4a49… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Tue May 9 07:57:36 2006 -0400 wined3d: Share get_opcode. --- dlls/wined3d/baseshader.c | 24 ++++++++++++++++++++++++ dlls/wined3d/pixelshader.c | 25 +++---------------------- dlls/wined3d/vertexshader.c | 23 ++++------------------- dlls/wined3d/wined3d_private.h | 4 ++++ 4 files changed, 35 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 5b39e9a..7f34bfd 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -54,4 +54,28 @@ int shader_addline( return 0; } +const SHADER_OPCODE* shader_get_opcode( + IWineD3DBaseShader *iface, const DWORD code) { + + IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl*) iface; + + DWORD i = 0; + DWORD version = This->baseShader.version; + DWORD hex_version = This->baseShader.hex_version; + const SHADER_OPCODE *shader_ins = This->baseShader.shader_ins; + + /** TODO: use dichotomic search */ + while (NULL != shader_ins[i].name) { + if (((code & D3DSI_OPCODE_MASK) == shader_ins[i].opcode) && + (((hex_version >= shader_ins[i].min_version) && (hex_version <= shader_ins[i].max_version)) || + ((shader_ins[i].min_version == 0) && (shader_ins[i].max_version == 0)))) { + return &shader_ins[i]; + } + ++i; + } + FIXME("Unsupported opcode %lx(%ld) masked %lx version %ld\n", + code, code, code & D3DSI_OPCODE_MASK, version); + return NULL; +} + /* TODO: Move other shared code here */ diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index f52c98c..4265f0c 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -719,25 +719,6 @@ CONST SHADER_OPCODE IWineD3DPixelShaderI {0, NULL, NULL, 0, NULL, 0, 0} }; -inline static const SHADER_OPCODE* pshader_program_get_opcode(IWineD3DPixelShaderImpl *This, const DWORD code) { - DWORD i = 0; - DWORD version = This->baseShader.version; - DWORD hex_version = D3DPS_VERSION(version/10, version%10); - const SHADER_OPCODE *shader_ins = This->baseShader.shader_ins; - - /** TODO: use dichotomic search */ - while (NULL != shader_ins[i].name) { - if (((code & D3DSI_OPCODE_MASK) == shader_ins[i].opcode) && - (((hex_version >= shader_ins[i].min_version) && (hex_version <= shader_ins[i].max_version)) || - ((shader_ins[i].min_version == 0) && (shader_ins[i].max_version == 0)))) { - return &shader_ins[i]; - } - ++i; - } - FIXME("Unsupported opcode %lx(%ld) masked %lx version %ld\n", code, code, code & D3DSI_OPCODE_MASK, version); - return NULL; -} - inline static BOOL pshader_is_version_token(DWORD token) { return 0xFFFF0000 == (token & 0xFFFF0000); } @@ -945,7 +926,7 @@ inline static void pshader_program_get_r } /* Fetch opcode */ - curOpcode = pshader_program_get_opcode(This, *pToken); + curOpcode = shader_get_opcode((IWineD3DBaseShader*) This, *pToken); ++pToken; /* Skip declarations (for now) */ @@ -1134,7 +1115,7 @@ #if 0 /* Not sure what these are here fo code = *pToken; #endif pInstr = pToken; - curOpcode = pshader_program_get_opcode(This, *pToken); + curOpcode = shader_get_opcode((IWineD3DBaseShader*) This, *pToken); ++pToken; if (NULL == curOpcode) { /* unknown current opcode ... (shouldn't be any!) */ @@ -1779,7 +1760,7 @@ HRESULT WINAPI IWineD3DPixelShaderImpl_S if (!This->baseShader.version) { WARN("(%p) : pixel shader doesn't have a valid version identifier\n", This); } - curOpcode = pshader_program_get_opcode(This, *pToken); + curOpcode = shader_get_opcode((IWineD3DBaseShader*) This, *pToken); ++pToken; ++len; if (NULL == curOpcode) { diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 382700b..56d322a 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -554,21 +554,6 @@ CONST SHADER_OPCODE IWineD3DVertexShader {0, NULL, NULL, 0, NULL, 0, 0} }; -inline static const SHADER_OPCODE* vshader_program_get_opcode(IWineD3DVertexShaderImpl *This, const DWORD code) { - DWORD i = 0; - const SHADER_OPCODE *shader_ins = This->baseShader.shader_ins; - - /** TODO: use dichotomic search or hash table */ - while (NULL != shader_ins[i].name) { - if ((code & D3DSI_OPCODE_MASK) == shader_ins[i].opcode) { - return &shader_ins[i]; - } - ++i; - } - FIXME("Unsupported opcode %lx\n",code); - return NULL; -} - inline static void vshader_program_dump_vs_param(const DWORD param, int input) { static const char* rastout_reg_names[] = { "oPos", "oFog", "oPts" }; static const char swizzle_reg_chars[] = "xyzw"; @@ -1147,7 +1132,7 @@ #endif pToken += comment_len; continue; } - curOpcode = vshader_program_get_opcode(This, *pToken); + curOpcode = shader_get_opcode((IWineD3DBaseShader*) This, *pToken); ++pToken; /* TODO: dcl's */ /* TODO: Consts */ @@ -1274,7 +1259,7 @@ #endif continue; } - curOpcode = vshader_program_get_opcode(This, *pToken); + curOpcode = shader_get_opcode((IWineD3DBaseShader*) This, *pToken); ++pToken; if (NULL == curOpcode) { /* unknown current opcode ... (shouldn't be any!) */ @@ -1557,7 +1542,7 @@ #endif pToken += comment_len; continue ; } - curOpcode = vshader_program_get_opcode(This, *pToken); + curOpcode = shader_get_opcode((IWineD3DBaseShader*) This, *pToken); ++pToken; if (NULL == curOpcode) { i = 0; @@ -1907,7 +1892,7 @@ HRESULT WINAPI IWineD3DVertexShaderImpl_ len += comment_len + 1; continue; } - curOpcode = vshader_program_get_opcode(This, *pToken); + curOpcode = shader_get_opcode((IWineD3DBaseShader*) This, *pToken); ++pToken; ++len; if (NULL == curOpcode) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index de303c5..238d5ac 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1220,6 +1220,10 @@ extern int shader_addline( SHADER_BUFFER* buffer, const char* fmt, ...); +extern const SHADER_OPCODE* shader_get_opcode( + IWineD3DBaseShader *iface, + const DWORD code); + /***************************************************************************** * IDirect3DBaseShader implementation structure */

1 0

Robert Reif : winmm: Print out more info on failed test.
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: 9ff27bf6bcc13966028ff0401e70c797b1c8a884 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9ff27bf6bcc13966028ff04… Author: Robert Reif <reif(a)earthlink.net> Date: Tue May 9 07:55:21 2006 -0400 winmm: Print out more info on failed test. Print out more info on failed test. Looks like there is a bug in ALSA OSS emulation where it is returning a mid-sample position. --- dlls/winmm/tests/wave.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index a51fa37..a0646fd 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -472,9 +472,10 @@ static void check_position(int device, H trace("waveOutGetPosition(%s): TIME_SAMPLES not supported, " "returned %s\n",dev_name(device),wave_time_format(mmtime.wType)); returned = time_to_bytes(&mmtime, pwfx); - ok(returned == bytes, "waveOutGetPosition(%s): returned %ld samples, " - "should be %ld\n", dev_name(device), bytes_to_samples(returned, pwfx), - bytes_to_samples(bytes, pwfx)); + ok(returned == bytes, "waveOutGetPosition(%s): returned %ld samples " + "(%ld bytes), should be %ld (%ld bytes)\n", dev_name(device), + bytes_to_samples(returned, pwfx), returned, + bytes_to_samples(bytes, pwfx), bytes); mmtime.wType = TIME_MS; rc=waveOutGetPosition(wout, &mmtime, sizeof(mmtime));

1 0

Hans Leidekker : dnsapi: The ttl value should be ignored when comparing dns records.
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: a9328088fe7fe54af543e631edb96889206fa116 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a9328088fe7fe54af543e63… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue May 9 12:04:44 2006 +0200 dnsapi: The ttl value should be ignored when comparing dns records. --- dlls/dnsapi/record.c | 1 - dlls/dnsapi/tests/record.c | 3 +++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 8b68314..27143ec 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -134,7 +134,6 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECOR if (r1->wType != r2->wType || r1->wDataLength != r2->wDataLength || r1->Flags.DW != r2->Flags.DW || - r1->dwTtl != r2->dwTtl || r1->dwReserved != r2->dwReserved) return FALSE; wide = (r1->Flags.S.CharSet == DnsCharSetUnicode) ? TRUE : FALSE; diff --git a/dlls/dnsapi/tests/record.c b/dlls/dnsapi/tests/record.c index 6173e57..0b5b0a6 100644 --- a/dlls/dnsapi/tests/record.c +++ b/dlls/dnsapi/tests/record.c @@ -65,6 +65,9 @@ static void test_DnsRecordCompare( void r1.Flags.S.CharSet = DnsCharSetAnsi; ok( pDnsRecordCompare( (PDNS_RECORD)&r1, (PDNS_RECORD)&r2 ) == TRUE, "failed unexpectedly\n" ); + r1.dwTtl = 0; + ok( pDnsRecordCompare( (PDNS_RECORD)&r1, (PDNS_RECORD)&r2 ) == TRUE, "failed unexpectedly\n" ); + r2.Data.A.IpAddress = 0; ok( pDnsRecordCompare( (PDNS_RECORD)&r1, (PDNS_RECORD)&r2 ) == FALSE, "succeeded unexpectedly\n" ); }

1 0

David Lichterman : mciwave: Fix make install error.
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: c8a6b63d1eb5b1a1568ac5a646d88e38461c938c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c8a6b63d1eb5b1a1568ac5a… Author: David Lichterman <laviddichterman(a)gmail.com> Date: Tue May 9 18:49:19 2006 +0200 mciwave: Fix make install error. --- dlls/mciwave/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mciwave/Makefile.in b/dlls/mciwave/Makefile.in index 1e793f3..924e715 100644 --- a/dlls/mciwave/Makefile.in +++ b/dlls/mciwave/Makefile.in @@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -MODULE = mciwave +MODULE = mciwave.dll IMPORTS = winmm user32 kernel32 C_SRCS = \

1 0

Alexandre Julliard : user: Added specific winproc functions for calling dialog procedures.
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: 397bf3c2b133fe36529efcc4c1906bac1aac2da8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=397bf3c2b133fe36529efcc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 9 20:33:11 2006 +0200 user: Added specific winproc functions for calling dialog procedures. --- dlls/user/defdlg.c | 42 ++++++++------------------ dlls/user/winproc.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/user/winproc.h | 4 +++ 3 files changed, 97 insertions(+), 30 deletions(-) diff --git a/dlls/user/defdlg.c b/dlls/user/defdlg.c index 5cf01e9..abd19b1 100644 --- a/dlls/user/defdlg.c +++ b/dlls/user/defdlg.c @@ -35,9 +35,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(dialog); /*********************************************************************** * DEFDLG_GetDlgProc */ -static WNDPROC DEFDLG_GetDlgProc( HWND hwnd ) +static DLGPROC DEFDLG_GetDlgProc( HWND hwnd ) { - WNDPROC ret; + DLGPROC ret; WND *wndPtr = WIN_GetPtr( hwnd ); if (!wndPtr) return 0; @@ -46,7 +46,7 @@ static WNDPROC DEFDLG_GetDlgProc( HWND h ERR( "cannot get dlg proc %p from other process\n", hwnd ); return 0; } - ret = *(WNDPROC *)((char *)wndPtr->wExtra + DWLP_DLGPROC); + ret = *(DLGPROC *)((char *)wndPtr->wExtra + DWLP_DLGPROC); WIN_ReleasePtr( wndPtr ); return ret; } @@ -381,7 +381,7 @@ LRESULT WINAPI DefDlgProc16( HWND16 hwnd LPARAM lParam ) { DIALOGINFO *dlgInfo; - WNDPROC16 dlgproc; + DLGPROC16 dlgproc; HWND hwnd32 = WIN_Handle32( hwnd ); BOOL result = FALSE; @@ -390,14 +390,8 @@ LRESULT WINAPI DefDlgProc16( HWND16 hwnd SetWindowLongPtrW( hwnd32, DWLP_MSGRESULT, 0 ); - if ((dlgproc = (WNDPROC16)DEFDLG_GetDlgProc( hwnd32 ))) - { - /* Call dialog procedure */ - result = CallWindowProc16( dlgproc, hwnd, msg, wParam, lParam ); - /* 16 bit dlg procs only return BOOL16 */ - if( WINPROC_GetProcType( (WNDPROC)dlgproc ) == WIN_PROC_16 ) - result = LOWORD(result); - } + if ((dlgproc = (DLGPROC16)DEFDLG_GetDlgProc( hwnd32 ))) /* Call dialog procedure */ + result = WINPROC_CallDlgProc16( dlgproc, hwnd, msg, wParam, lParam ); if (!result && IsWindow(hwnd32)) { @@ -439,7 +433,7 @@ LRESULT WINAPI DefDlgProc16( HWND16 hwnd LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { DIALOGINFO *dlgInfo; - WNDPROC dlgproc; + DLGPROC dlgproc; BOOL result = FALSE; /* Perform DIALOGINFO initialization if not done */ @@ -447,14 +441,8 @@ LRESULT WINAPI DefDlgProcA( HWND hwnd, U SetWindowLongPtrW( hwnd, DWLP_MSGRESULT, 0 ); - if ((dlgproc = DEFDLG_GetDlgProc( hwnd ))) - { - /* Call dialog procedure */ - result = CallWindowProcA( dlgproc, hwnd, msg, wParam, lParam ); - /* 16 bit dlg procs only return BOOL16 */ - if( WINPROC_GetProcType( dlgproc ) == WIN_PROC_16 ) - result = LOWORD(result); - } + if ((dlgproc = DEFDLG_GetDlgProc( hwnd ))) /* Call dialog procedure */ + result = WINPROC_CallDlgProcA( dlgproc, hwnd, msg, wParam, lParam ); if (!result && IsWindow(hwnd)) { @@ -497,21 +485,15 @@ LRESULT WINAPI DefDlgProcW( HWND hwnd, U { DIALOGINFO *dlgInfo; BOOL result = FALSE; - WNDPROC dlgproc; + DLGPROC dlgproc; /* Perform DIALOGINFO intialization if not done */ if(!(dlgInfo = DIALOG_get_info( hwnd, TRUE ))) return -1; SetWindowLongPtrW( hwnd, DWLP_MSGRESULT, 0 ); - if ((dlgproc = DEFDLG_GetDlgProc( hwnd ))) - { - /* Call dialog procedure */ - result = CallWindowProcW( dlgproc, hwnd, msg, wParam, lParam ); - /* 16 bit dlg procs only return BOOL16 */ - if( WINPROC_GetProcType( dlgproc ) == WIN_PROC_16 ) - result = LOWORD(result); - } + if ((dlgproc = DEFDLG_GetDlgProc( hwnd ))) /* Call dialog procedure */ + result = WINPROC_CallDlgProcW( dlgproc, hwnd, msg, wParam, lParam ); if (!result && IsWindow(hwnd)) { diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index 31a5632..975fe1b 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -3272,3 +3272,84 @@ LRESULT WINAPI CallWindowProcW( WNDPROC return 0; } } + + +/********************************************************************** + * WINPROC_CallDlgProc16 + */ +INT_PTR WINPROC_CallDlgProc16( DLGPROC16 func, HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam ) +{ + WINDOWPROC *proc; + + if (!func) return 0; + + if (!(proc = handle16_to_proc( (WNDPROC16)func ))) + return LOWORD( WINPROC_CallWndProc16( (WNDPROC16)func, hwnd, msg, wParam, lParam ) ); + + switch(proc->type) + { + case WIN_PROC_16: + return LOWORD( WINPROC_CallWndProc16( proc->proc16, hwnd, msg, wParam, lParam ) ); + case WIN_PROC_32A: + return __wine_call_wndproc_32A( hwnd, msg, wParam, lParam, proc->thunk.proc ); + case WIN_PROC_32W: + return __wine_call_wndproc_32W( hwnd, msg, wParam, lParam, proc->thunk.proc ); + default: + WARN_(relay)("Invalid proc %p\n", proc ); + return 0; + } +} + + +/********************************************************************** + * WINPROC_CallDlgProcA + */ +INT_PTR WINPROC_CallDlgProcA( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +{ + WINDOWPROC *proc; + + if (!func) return 0; + + if (!(proc = handle_to_proc( (WNDPROC)func ))) + return WINPROC_CallWndProc( (WNDPROC)func, hwnd, msg, wParam, lParam ); + + switch(proc->type) + { + case WIN_PROC_16: + return LOWORD( WINPROC_CallProc32ATo16( proc->proc16, hwnd, msg, wParam, lParam ) ); + case WIN_PROC_32A: + return WINPROC_CallWndProc( proc->thunk.proc, hwnd, msg, wParam, lParam ); + case WIN_PROC_32W: + return WINPROC_CallProc32ATo32W( proc->thunk.proc, hwnd, msg, wParam, lParam ); + default: + WARN_(relay)("Invalid proc %p\n", proc ); + return 0; + } +} + + +/********************************************************************** + * WINPROC_CallDlgProcW + */ +INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +{ + WINDOWPROC *proc; + + if (!func) return 0; + + if (!(proc = handle_to_proc( (WNDPROC)func ))) + return WINPROC_CallWndProc( (WNDPROC)func, hwnd, msg, wParam, lParam ); + + switch(proc->type) + { + case WIN_PROC_16: + return LOWORD( WINPROC_CallProc32WTo16( proc->proc16, hwnd, msg, wParam, lParam )); + case WIN_PROC_32A: + return WINPROC_CallProc32WTo32A( proc->thunk.proc, hwnd, msg, wParam, lParam ); + case WIN_PROC_32W: + return WINPROC_CallWndProc( proc->thunk.proc, hwnd, msg, wParam, lParam ); + default: + WARN_(relay)("Invalid proc %p\n", proc ); + return 0; + } +} diff --git a/dlls/user/winproc.h b/dlls/user/winproc.h index d03b4b8..a912bbf 100644 --- a/dlls/user/winproc.h +++ b/dlls/user/winproc.h @@ -85,6 +85,10 @@ extern void WINPROC_UnmapMsg32ATo16( HWN extern void WINPROC_UnmapMsg32WTo16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, MSGPARAM16* pm16 ); +extern INT_PTR WINPROC_CallDlgProc16( DLGPROC16 func, HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam ); +extern INT_PTR WINPROC_CallDlgProcA( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); +extern INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); + /* map a Unicode string to a 16-bit pointer */ inline static SEGPTR map_str_32W_to_16( LPCWSTR str ) {

1 0

Alexandre Julliard : user: Always set the correct class winproc depending on the A/W type.
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: cd0d7529ded1b79f72d12a318d5de47966308454 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cd0d7529ded1b79f72d12a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 9 20:00:40 2006 +0200 user: Always set the correct class winproc depending on the A/W type. --- dlls/user/class.c | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/user/class.c b/dlls/user/class.c index fe89e65..1f36562 100644 --- a/dlls/user/class.c +++ b/dlls/user/class.c @@ -185,8 +185,18 @@ static WNDPROC CLASS_GetProc( CLASS *cla */ static void CLASS_SetProc16( CLASS *classPtr, WNDPROC16 newproc ) { - classPtr->winprocA = WINPROC_AllocProc16( newproc ); - classPtr->winprocW = 0; + WNDPROC proc = WINPROC_AllocProc16( newproc ); + + if (WINPROC_GetProcType( proc ) == WIN_PROC_32W) + { + classPtr->winprocA = 0; + classPtr->winprocW = proc; + } + else + { + classPtr->winprocA = proc; + classPtr->winprocW = 0; + } } @@ -198,23 +208,17 @@ static void CLASS_SetProc16( CLASS *clas */ static void CLASS_SetProc( CLASS *classPtr, WNDPROC newproc, WINDOWPROCTYPE type ) { - WNDPROC *proc = &classPtr->winprocA; + WNDPROC proc = WINPROC_AllocProc( newproc, type ); - if (classPtr->winprocW) + if (WINPROC_GetProcType( proc ) == WIN_PROC_32W) { - /* if we have a Unicode proc, use it if we have no ASCII proc - * or if we have both and Unicode was requested - */ - if (!*proc || type == WIN_PROC_32W) proc = &classPtr->winprocW; + classPtr->winprocA = 0; + classPtr->winprocW = proc; } - *proc = WINPROC_AllocProc( newproc, type ); - /* now clear the one that we didn't set */ - if (classPtr->winprocA && classPtr->winprocW) + else { - if (proc == &classPtr->winprocA) - classPtr->winprocW = 0; - else - classPtr->winprocA = 0; + classPtr->winprocA = proc; + classPtr->winprocW = 0; } }

1 0

Alexandre Julliard : user: Use handles for 32-bit window procedures instead of pointers into the bss segment .
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: c1f3adc4a4cd53e0b44b7f4bbb11a676d9c16f91 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c1f3adc4a4cd53e0b44b7f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 9 20:24:19 2006 +0200 user: Use handles for 32-bit window procedures instead of pointers into the bss segment. --- dlls/user/winproc.c | 233 ++++++++++++++++++--------------------------------- 1 files changed, 82 insertions(+), 151 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=c1f3adc4a4cd53e0b44…

1 0

Alexandre Julliard : user: Separate the 16 and 32-bit versions of WINPROC_AllocProc.
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: 41b5e687fd42db959f735ba5c3912e57621b2e09 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=41b5e687fd42db959f735ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 9 19:55:05 2006 +0200 user: Separate the 16 and 32-bit versions of WINPROC_AllocProc. --- dlls/user/class.c | 15 +++++ dlls/user/win.c | 2 - dlls/user/winproc.c | 143 +++++++++++++++++++++++++++++++-------------------- dlls/user/winproc.h | 1 dlls/user/wnd16.c | 6 +- 5 files changed, 106 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=41b5e687fd42db959f7…

1 0

Alexandre Julliard : user: Make sure to always pass a 16-bit pointer to CallWindowProc16.
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: 0b7dcd24184d42cd630879cf7bf3428074468d73 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0b7dcd24184d42cd630879c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 9 15:03:14 2006 +0200 user: Make sure to always pass a 16-bit pointer to CallWindowProc16. --- dlls/user/msg16.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user/msg16.c b/dlls/user/msg16.c index 4d79fdd..db3da01 100644 --- a/dlls/user/msg16.c +++ b/dlls/user/msg16.c @@ -67,7 +67,7 @@ LRESULT WINAPI SendMessage16( HWND16 hwn if (!(winproc = (WNDPROC16)GetWindowLong16( hwnd16, GWLP_WNDPROC ))) return 0; SPY_EnterMessage( SPY_SENDMESSAGE16, hwnd, msg, wparam, lparam ); - result = CallWindowProc16( (WNDPROC16)winproc, hwnd16, msg, wparam, lparam ); + result = CallWindowProc16( winproc, hwnd16, msg, wparam, lparam ); SPY_ExitMessage( SPY_RESULT_OK16, hwnd, msg, result, wparam, lparam ); } else /* map to 32-bit unicode for inter-thread/process message */ @@ -369,7 +369,7 @@ LONG WINAPI DispatchMessage16( const MSG else SetLastError( ERROR_INVALID_WINDOW_HANDLE ); return 0; } - winproc = (WNDPROC16)wndPtr->winproc; + winproc = WINPROC_GetProc16( wndPtr->winproc ); WIN_ReleasePtr( wndPtr ); SPY_EnterMessage( SPY_DISPATCHMESSAGE16, hwnd, msg->message, msg->wParam, msg->lParam );

1 0