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

Vitaliy Margolen : d3d8: All objects created by device should keep reference to it.
by Alexandre Julliard 22 May '06

22 May '06

Module: wine Branch: refs/heads/master Commit: 1cc318c5a6cbed745da3c6d8ff0c10c500cb6f6b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1cc318c5a6cbed745da3c6d… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sat May 20 10:39:03 2006 -0600 d3d8: All objects created by device should keep reference to it. --- dlls/d3d8/cubetexture.c | 1 + dlls/d3d8/d3d8_private.h | 18 +++++++++++++++--- dlls/d3d8/device.c | 12 ++++++++++-- dlls/d3d8/indexbuffer.c | 1 + dlls/d3d8/swapchain.c | 1 + dlls/d3d8/texture.c | 1 + dlls/d3d8/vertexshader.c | 1 - dlls/d3d8/volumetexture.c | 1 + 8 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 3f742fe..53991cc 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -57,6 +57,7 @@ ULONG WINAPI IDirect3DCubeTexture8Impl_R if (ref == 0) { TRACE("Releasing child %p\n", This->wineD3DCubeTexture); IWineD3DCubeTexture_Release(This->wineD3DCubeTexture); + IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); } return ref; diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 29556d1..a66871b 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -229,6 +229,9 @@ struct IDirect3DSwapChain8Impl /* IDirect3DSwapChain8 fields */ IWineD3DSwapChain *wineD3DSwapChain; + + /* Parent reference */ + LPDIRECT3DDEVICE8 parentDevice; }; /* ----------------- */ @@ -321,6 +324,9 @@ struct IDirect3DIndexBuffer8Impl /* IDirect3DResource8 fields */ IWineD3DIndexBuffer *wineD3DIndexBuffer; + + /* Parent reference */ + LPDIRECT3DDEVICE8 parentDevice; }; /* --------------------- */ @@ -360,6 +366,9 @@ struct IDirect3DCubeTexture8Impl /* IDirect3DResource8 fields */ IWineD3DCubeTexture *wineD3DCubeTexture; + + /* Parent reference */ + LPDIRECT3DDEVICE8 parentDevice; }; /* ----------------- */ @@ -382,6 +391,9 @@ struct IDirect3DTexture8Impl /* IDirect3DResourc8 fields */ IWineD3DTexture *wineD3DTexture; + + /* Parent reference */ + LPDIRECT3DDEVICE8 parentDevice; }; /* ----------------------- */ @@ -404,6 +416,9 @@ struct IDirect3DVolumeTexture8Impl /* IDirect3DResource8 fields */ IWineD3DVolumeTexture *wineD3DVolumeTexture; + + /* Parent reference */ + LPDIRECT3DDEVICE8 parentDevice; }; /* ----------------------- */ @@ -532,9 +547,6 @@ struct IDirect3DVertexShader8Impl { LONG ref; IWineD3DVertexShader *wineD3DVertexShader; - - /* Parent reference */ - LPDIRECT3DDEVICE8 parentDevice; }; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index eed71e5..6cbbc27 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -214,6 +214,8 @@ HRESULT WINAPI IDirect3DDevice8Impl_Crea HeapFree(GetProcessHeap(), 0 , object); *pSwapChain = NULL; }else{ + IUnknown_AddRef(iface); + object->parentDevice = iface; *pSwapChain = (IDirect3DSwapChain8 *)object; } TRACE("(%p) returning %p\n", This, *pSwapChain); @@ -312,6 +314,8 @@ HRESULT WINAPI IDirect3DDevice8Impl_Crea HeapFree(GetProcessHeap(), 0, object); /* *ppTexture = NULL; */ } else { + IUnknown_AddRef(iface); + object->parentDevice = iface; *ppTexture = (LPDIRECT3DTEXTURE8) object; } @@ -350,6 +354,8 @@ HRESULT WINAPI IDirect3DDevice8Impl_Crea HeapFree(GetProcessHeap(), 0, object); *ppVolumeTexture = NULL; } else { + IUnknown_AddRef(iface); + object->parentDevice = iface; *ppVolumeTexture = (LPDIRECT3DVOLUMETEXTURE8) object; } TRACE("(%p) returning %p\n", This , *ppVolumeTexture); @@ -387,6 +393,8 @@ HRESULT WINAPI IDirect3DDevice8Impl_Crea HeapFree(GetProcessHeap(), 0, object); *ppCubeTexture = NULL; } else { + IUnknown_AddRef(iface); + object->parentDevice = iface; *ppCubeTexture = (LPDIRECT3DCUBETEXTURE8) object; } @@ -452,6 +460,8 @@ HRESULT WINAPI IDirect3DDevice8Impl_Crea HeapFree(GetProcessHeap(), 0, object); *ppIndexBuffer = NULL; } else { + IUnknown_AddRef(iface); + object->parentDevice = iface; *ppIndexBuffer = (LPDIRECT3DINDEXBUFFER8)object; } return hrc; @@ -1071,8 +1081,6 @@ HRESULT WINAPI IDirect3DDevice8Impl_Crea FIXME("(%p) : Number of shaders exceeds the maximum number of possible shaders\n", This); hrc = E_OUTOFMEMORY; } else { - IUnknown_AddRef(iface); - object->parentDevice = iface; This->vShaders[i] = object; *ppShader = i + VS_HIGHESTFIXEDFXF + 1; } diff --git a/dlls/d3d8/indexbuffer.c b/dlls/d3d8/indexbuffer.c index 2f06cf9..316e1ff 100644 --- a/dlls/d3d8/indexbuffer.c +++ b/dlls/d3d8/indexbuffer.c @@ -56,6 +56,7 @@ ULONG WINAPI IDirect3DIndexBuffer8Impl_R if (ref == 0) { IWineD3DIndexBuffer_Release(This->wineD3DIndexBuffer); + IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); } return ref; diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 583b7ec..83b4c2f 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -56,6 +56,7 @@ ULONG WINAPI IDirect3DSwapChain8Impl_Rel if (ref == 0) { IWineD3DSwapChain_Release(This->wineD3DSwapChain); + IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); } return ref; diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index c379489..273bd51 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -57,6 +57,7 @@ ULONG WINAPI IDirect3DTexture8Impl_Relea if (ref == 0) { IWineD3DTexture_Release(This->wineD3DTexture); + IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); } return ref; diff --git a/dlls/d3d8/vertexshader.c b/dlls/d3d8/vertexshader.c index f11e756..5bba7aa 100644 --- a/dlls/d3d8/vertexshader.c +++ b/dlls/d3d8/vertexshader.c @@ -56,7 +56,6 @@ ULONG WINAPI IDirect3DVertexShader8Impl_ if (ref == 0) { IWineD3DVertexShader_Release(This->wineD3DVertexShader); - IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); } return ref; diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index 11cfaef..2377ae9 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -57,6 +57,7 @@ ULONG WINAPI IDirect3DVolumeTexture8Impl if (ref == 0) { IWineD3DVolumeTexture_Release(This->wineD3DVolumeTexture); + IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); } return ref;

1 0

Vitaliy Margolen : include: SwapChain::GetBackBuffer takes 3 parameters, not 4.
by Alexandre Julliard 22 May '06

22 May '06

Module: wine Branch: refs/heads/master Commit: 17662eac6c886067be241a6a60e878a67ec136a2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=17662eac6c886067be241a6… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sat May 20 10:32:26 2006 -0600 include: SwapChain::GetBackBuffer takes 3 parameters, not 4. --- include/d3d8.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3d8.h b/include/d3d8.h index ca46eab..be392c5 100644 --- a/include/d3d8.h +++ b/include/d3d8.h @@ -256,7 +256,7 @@ #define IDirect3DSwapChain8_AddRef(p) #define IDirect3DSwapChain8_Release(p) (p)->lpVtbl->Release(p) /*** IDirect3DSwapChain8 methods ***/ #define IDirect3DSwapChain8_Present(p,a,b,c) (p)->lpVtbl->Present(p,a,b,c) -#define IDirect3DSwapChain8_GetBackBuffer(p,a,b,c,d) (p)->lpVtbl->GetBackBuffer(p,a,b,c,d) +#define IDirect3DSwapChain8_GetBackBuffer(p,a,b,c) (p)->lpVtbl->GetBackBuffer(p,a,b,c) #else /*** IUnknown methods ***/ #define IDirect3DSwapChain8_QueryInterface(p,a,b) (p)->QueryInterface(a,b) @@ -264,7 +264,7 @@ #define IDirect3DSwapChain8_AddRef(p) #define IDirect3DSwapChain8_Release(p) (p)->Release() /*** IDirect3DSwapChain8 methods ***/ #define IDirect3DSwapChain8_Present(p,a,b,c) (p)->Present(a,b,c) -#define IDirect3DSwapChain8_GetBackBuffer(p,a,b,c,d) (p)->GetBackBuffer(a,b,c,d) +#define IDirect3DSwapChain8_GetBackBuffer(p,a,b,c) (p)->GetBackBuffer(a,b,c) #endif /*****************************************************************************

1 0

Robert Shearman : comctl32: Make sure to always have the default pushbutton for wizards as an enabled button .
by Alexandre Julliard 22 May '06

22 May '06

Module: wine Branch: refs/heads/master Commit: a247e6975f367af7b4022623a277dd8824c699da URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a247e6975f367af7b402262… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat May 20 15:31:10 2006 +0100 comctl32: Make sure to always have the default pushbutton for wizards as an enabled button. --- dlls/comctl32/propsheet.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index a253099..acee9bf 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2433,17 +2433,23 @@ static void PROPSHEET_SetWizButtons(HWND EnableWindow(hwndNext, FALSE); EnableWindow(hwndFinish, FALSE); + /* set the default pushbutton to an enabled button */ + if (((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH)) + SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0); + else if (dwFlags & PSWIZB_NEXT) + SendMessageW(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0); + else if (dwFlags & PSWIZB_BACK) + SendMessageW(hwndDlg, DM_SETDEFID, IDC_BACK_BUTTON, 0); + else + SendMessageW(hwndDlg, DM_SETDEFID, IDCANCEL, 0); + + if (dwFlags & PSWIZB_BACK) EnableWindow(hwndBack, TRUE); if (dwFlags & PSWIZB_NEXT) - { EnableWindow(hwndNext, TRUE); - /* Set the Next button as the default pushbutton */ - SendMessageW(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0); - } - if (!psInfo->hasFinish) { if ((dwFlags & PSWIZB_FINISH) || (dwFlags & PSWIZB_DISABLEDFINISH)) @@ -2455,12 +2461,7 @@ static void PROPSHEET_SetWizButtons(HWND ShowWindow(hwndFinish, SW_SHOW); if (!(dwFlags & PSWIZB_DISABLEDFINISH)) - { EnableWindow(hwndFinish, TRUE); - - /* Set the Finish button as the default pushbutton */ - SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0); - } } else {

1 0

Robert Shearman : comctl32: A PSM_SETWIZBUTTONS message specifying PSWIZB_FINISH or
by Alexandre Julliard 22 May '06

22 May '06

Module: wine Branch: refs/heads/master Commit: 2682ff43d0fc61a8f178ad4c9841f0dd739fa42a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2682ff43d0fc61a8f178ad4… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat May 20 15:31:01 2006 +0100 comctl32: A PSM_SETWIZBUTTONS message specifying PSWIZB_FINISH or PSWIZB_DISABLEDFINISH, followed by another one without those flags should show the next button again and hide the finish button. --- dlls/comctl32/propsheet.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index c1654dd..a253099 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2438,14 +2438,6 @@ static void PROPSHEET_SetWizButtons(HWND if (dwFlags & PSWIZB_NEXT) { - if (!psInfo->hasFinish) - { - /* Hide the Finish button */ - ShowWindow(hwndFinish, SW_HIDE); - } - - /* Show and enable the Next button */ - ShowWindow(hwndNext, SW_SHOW); EnableWindow(hwndNext, TRUE); /* Set the Next button as the default pushbutton */ @@ -2470,6 +2462,13 @@ static void PROPSHEET_SetWizButtons(HWND SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0); } } + else + { + /* Hide the Finish button */ + ShowWindow(hwndFinish, SW_HIDE); + /* Show the Next button */ + ShowWindow(hwndNext, SW_SHOW); + } } else if (!(dwFlags & PSWIZB_DISABLEDFINISH)) EnableWindow(hwndFinish, TRUE);

1 0

Alexandre Julliard : user: Get rid of the WINPROC_Map/ UnmapMsg32ATo32W functions.
by Alexandre Julliard 22 May '06

22 May '06

Module: wine Branch: refs/heads/master Commit: fcce047f616e1e6c069a68beba42533761f8dfde URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fcce047f616e1e6c069a68b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 20 20:02:10 2006 +0200 user: Get rid of the WINPROC_Map/UnmapMsg32ATo32W functions. --- dlls/user/winproc.c | 189 +++++++-------------------------------------------- 1 files changed, 26 insertions(+), 163 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index 09cf599..36e7907 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -500,31 +500,6 @@ static LRESULT call_dialog_proc( HWND hw return ret; } -/********************************************************************** - * WINPROC_CallWndProc32 - * - * Call a 32-bit WndProc. - */ -static LRESULT WINPROC_CallWndProc( WNDPROC proc, HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam ) -{ - LRESULT retvalue; - - USER_CheckNotLock(); - - hwnd = WIN_GetFullHandle( hwnd ); - if (TRACE_ON(relay)) - DPRINTF( "%04lx:Call window proc %p (hwnd=%p,msg=%s,wp=%08x,lp=%08lx)\n", - GetCurrentThreadId(), proc, hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam ); - - retvalue = WINPROC_wrapper( proc, hwnd, msg, wParam, lParam ); - - if (TRACE_ON(relay)) - DPRINTF( "%04lx:Ret window proc %p (hwnd=%p,msg=%s,wp=%08x,lp=%08lx) retval=%08lx\n", - GetCurrentThreadId(), proc, hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam, retvalue ); - return retvalue; -} - /* call a 16-bit window procedure */ static LRESULT call_window_proc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam, LRESULT *result, void *arg ) @@ -728,120 +703,6 @@ inline static BOOL WINPROC_TestLBForStr( return (!(style & (LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE)) || (style & LBS_HASSTRINGS)); } -/********************************************************************** - * WINPROC_MapMsg32ATo32W - * - * Map a message from Ansi to Unicode. - * Return value is -1 on error, 0 if OK, 1 if an UnmapMsg call is needed. - * - * FIXME: - * WM_GETTEXT/WM_SETTEXT and static control with SS_ICON style: - * the first four bytes are the handle of the icon - * when the WM_SETTEXT message has been used to set the icon - */ -static INT WINPROC_MapMsg32ATo32W( HWND hwnd, UINT msg, WPARAM *pwparam, LPARAM *plparam ) -{ - switch(msg) - { - case WM_GETTEXT: - case WM_ASKCBFORMATNAME: - { - LPARAM *ptr = HeapAlloc( GetProcessHeap(), 0, - *pwparam * sizeof(WCHAR) + sizeof(LPARAM) ); - if (!ptr) return -1; - *ptr++ = *plparam; /* Store previous lParam */ - *plparam = (LPARAM)ptr; - } - return 1; - /* lparam is string (0-terminated) */ - case WM_SETTEXT: - case WM_WININICHANGE: - case WM_DEVMODECHANGE: - case CB_DIR: - case LB_DIR: - case LB_ADDFILE: - case EM_REPLACESEL: - if (!*plparam) return 0; - else - { - DWORD len = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)*plparam, -1, NULL, 0); - WCHAR *buf = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, (LPCSTR)*plparam, -1, buf, len); - *plparam = (LPARAM)buf; - return (*plparam ? 1 : -1); - } - default: /* No translation needed */ - return 0; - } -} - - -/********************************************************************** - * WINPROC_UnmapMsg32ATo32W - * - * Unmap a message that was mapped from Ansi to Unicode. - */ -static LRESULT WINPROC_UnmapMsg32ATo32W( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, - LRESULT result, WNDPROC dispatch ) -{ - switch(msg) - { - case WM_GETTEXT: - case WM_ASKCBFORMATNAME: - { - LPARAM *ptr = (LPARAM *)lParam - 1; - if (!wParam) result = 0; - else if (!(result = WideCharToMultiByte( CP_ACP, 0, (LPWSTR)lParam, -1, - (LPSTR)*ptr, wParam, NULL, NULL ))) - { - ((LPSTR)*ptr)[wParam-1] = 0; - result = wParam - 1; - } - else result--; /* do not count terminating null */ - HeapFree( GetProcessHeap(), 0, ptr ); - } - break; - case WM_GETTEXTLENGTH: - case CB_GETLBTEXTLEN: - case LB_GETTEXTLEN: - if (result >= 0) - { - /* Determine respective GETTEXT message */ - UINT msgGetText = - (msg == WM_GETTEXTLENGTH) ? WM_GETTEXT : - ((msg == CB_GETLBTEXTLEN) ? CB_GETLBTEXT : LB_GETTEXT); - /* wParam differs between the messages */ - WPARAM wp = (msg == WM_GETTEXTLENGTH) ? (WPARAM)(result + 1) : wParam; - - WCHAR* p = HeapAlloc (GetProcessHeap(), 0, (result + 1) * sizeof(WCHAR)); - - if (p) - { - LRESULT n; - - if (dispatch) - n = WINPROC_CallWndProc(dispatch, hwnd, msgGetText, wp, (LPARAM)p); - else - n = SendMessageW (hwnd, msgGetText, wp, (LPARAM)p); - - result = WideCharToMultiByte( CP_ACP, 0, p, n, NULL, 0, 0, NULL ); - HeapFree (GetProcessHeap(), 0, p); - } - } - break; - - case WM_SETTEXT: - case WM_WININICHANGE: - case WM_DEVMODECHANGE: - case CB_DIR: - case LB_DIR: - case LB_ADDFILE: - case EM_REPLACESEL: - HeapFree( GetProcessHeap(), 0, (void *)lParam ); - break; - } - return result; -} static UINT convert_handle_16_to_32(HANDLE16 src, unsigned int flags) @@ -1340,17 +1201,6 @@ static INT WINPROC_MapMsg16To32W( HWND h *pwparam32 = (WPARAM)wParam16; switch(msg16) { - case WM_GETTEXT: - case WM_SETTEXT: - case WM_WININICHANGE: - case WM_DEVMODECHANGE: - case WM_ASKCBFORMATNAME: - *plparam = (LPARAM)MapSL(*plparam); - return WINPROC_MapMsg32ATo32W( hwnd, *pmsg32, pwparam32, plparam ); - case WM_GETTEXTLENGTH: - case CB_GETLBTEXTLEN: - case LB_GETTEXTLEN: - return 1; /* need to map result */ case WM_NCCREATE: case WM_CREATE: { @@ -1452,17 +1302,10 @@ static INT WINPROC_MapMsg16To32W( HWND h * Unmap a message that was mapped from 16- to 32-bit Unicode. */ static LRESULT WINPROC_UnmapMsg16To32W( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, - LRESULT result, WNDPROC dispatch ) + LRESULT result ) { switch(msg) { - case WM_GETTEXT: - case WM_SETTEXT: - case WM_GETTEXTLENGTH: - case CB_GETLBTEXTLEN: - case LB_GETTEXTLEN: - case WM_ASKCBFORMATNAME: - return WINPROC_UnmapMsg32ATo32W( hwnd, msg, wParam, lParam, result, dispatch ); case WM_NCCREATE: case WM_CREATE: { @@ -2996,12 +2839,32 @@ static LRESULT WINPROC_CallProc16To32W( TRACE_(msg)("(hwnd=%p,msg=%s,wp=%08x,lp=%08lx)\n", hwnd32, SPY_GetMsgName(msg, hwnd32), wParam, lParam); - if (WINPROC_MapMsg16To32W( hwnd32, msg, wParam, &msg32, &wParam32, &lParam ) == -1) - return 0; + switch(msg) + { + case WM_GETTEXT: + case WM_ASKCBFORMATNAME: + case WM_SETTEXT: + case WM_WININICHANGE: + case WM_DEVMODECHANGE: + case CB_DIR: + case LB_DIR: + case LB_ADDFILE: + case EM_REPLACESEL: + ret = WINPROC_CallProcAtoW( callback, hwnd32, msg, wParam, (LPARAM)MapSL(lParam), result, arg ); + break; - ret = callback( hwnd32, msg32, wParam32, lParam, result, arg ); - *result = WINPROC_UnmapMsg16To32W( hwnd32, msg32, wParam32, lParam, *result, - (callback == call_window_proc) ? arg : NULL /*FIXME: hack*/ ); + case WM_GETTEXTLENGTH: + case CB_GETLBTEXTLEN: + case LB_GETTEXTLEN: + ret = WINPROC_CallProcAtoW( callback, hwnd32, msg, wParam, lParam, result, arg ); + break; + + default: + if (WINPROC_MapMsg16To32W( hwnd32, msg, wParam, &msg32, &wParam32, &lParam ) == -1) + return 0; + ret = callback( hwnd32, msg32, wParam32, lParam, result, arg ); + *result = WINPROC_UnmapMsg16To32W( hwnd32, msg32, wParam32, lParam, *result ); + } return ret; }

1 0

Alexandre Julliard : user: Added fast A-> W mapping for WM_GETTEXTLENGTH and related messages.
by Alexandre Julliard 22 May '06

22 May '06

Module: wine Branch: refs/heads/master Commit: 0eec70f41031ad545d61e8054111401f9673b1d8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0eec70f41031ad545d61e80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 20 19:58:38 2006 +0200 user: Added fast A->W mapping for WM_GETTEXTLENGTH and related messages. --- dlls/user/winproc.c | 32 +++++++++++++++++++++++++++----- 1 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index ae5b864..3dca3e9 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -770,11 +770,6 @@ static INT WINPROC_MapMsg32ATo32W( HWND *plparam = (LPARAM)buf; return (*plparam ? 1 : -1); } - case WM_GETTEXTLENGTH: - case CB_GETLBTEXTLEN: - case LB_GETTEXTLEN: - return 1; /* need to map result */ - case WM_PAINTCLIPBOARD: case WM_SIZECLIPBOARD: FIXME_(msg)("message %s (0x%x) needs translation, please report\n", SPY_GetMsgName(msg, hwnd), msg ); @@ -2704,6 +2699,33 @@ LRESULT WINPROC_CallProcAtoW( winproc_ca ret = callback( hwnd, msg, map_wparam_char_AtoW(wParam,2), lParam, result, arg ); break; + case WM_GETTEXTLENGTH: + case CB_GETLBTEXTLEN: + case LB_GETTEXTLEN: + ret = callback( hwnd, msg, wParam, lParam, result, arg ); + if (*result >= 0) + { + WCHAR *ptr, buffer[512]; + LRESULT tmp; + DWORD len = *result + 1; + /* Determine respective GETTEXT message */ + UINT msgGetText = (msg == WM_GETTEXTLENGTH) ? WM_GETTEXT : + ((msg == CB_GETLBTEXTLEN) ? CB_GETLBTEXT : LB_GETTEXT); + /* wParam differs between the messages */ + WPARAM wp = (msg == WM_GETTEXTLENGTH) ? len : wParam; + + if (!(ptr = get_buffer( buffer, sizeof(buffer), len * sizeof(WCHAR) ))) break; + + if (callback == call_window_proc) /* FIXME: hack */ + callback( hwnd, msgGetText, wp, (LPARAM)ptr, &tmp, arg ); + else + tmp = SendMessageW( hwnd, msgGetText, wp, (LPARAM)ptr ); + RtlUnicodeToMultiByteSize( &len, ptr, tmp * sizeof(WCHAR) ); + *result = len; + free_buffer( buffer, ptr ); + } + break; + default: if( (unmap = WINPROC_MapMsg32ATo32W( hwnd, msg, &wParam, &lParam )) == -1) { ERR_(msg)("Message translation failed. (msg=%s,wp=%08x,lp=%08lx)\n",

1 0

Alexandre Julliard : user: Added fast A-> W mapping for the remaining messages.
by Alexandre Julliard 22 May '06

22 May '06

Module: wine Branch: refs/heads/master Commit: 3d92de45c4856d24f0d87efc2d5e5035eedf6e4d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3d92de45c4856d24f0d87ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 20 19:59:19 2006 +0200 user: Added fast A->W mapping for the remaining messages. --- dlls/user/winproc.c | 19 ++++++------------- 1 files changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index 3dca3e9..09cf599 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -770,10 +770,6 @@ static INT WINPROC_MapMsg32ATo32W( HWND *plparam = (LPARAM)buf; return (*plparam ? 1 : -1); } - case WM_PAINTCLIPBOARD: - case WM_SIZECLIPBOARD: - FIXME_(msg)("message %s (0x%x) needs translation, please report\n", SPY_GetMsgName(msg, hwnd), msg ); - return -1; default: /* No translation needed */ return 0; } @@ -2497,7 +2493,6 @@ LRESULT WINPROC_CallProcAtoW( winproc_ca LPARAM lParam, LRESULT *result, void *arg ) { LRESULT ret = 0; - int unmap; TRACE_(msg)("(hwnd=%p,msg=%s,wp=%08x,lp=%08lx)\n", hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam); @@ -2726,16 +2721,14 @@ LRESULT WINPROC_CallProcAtoW( winproc_ca } break; + case WM_PAINTCLIPBOARD: + case WM_SIZECLIPBOARD: + FIXME_(msg)( "message %s (0x%x) needs translation, please report\n", + SPY_GetMsgName(msg, hwnd), msg ); + break; + default: - if( (unmap = WINPROC_MapMsg32ATo32W( hwnd, msg, &wParam, &lParam )) == -1) { - ERR_(msg)("Message translation failed. (msg=%s,wp=%08x,lp=%08lx)\n", - SPY_GetMsgName(msg, hwnd), wParam, lParam ); - return 0; - } ret = callback( hwnd, msg, wParam, lParam, result, arg ); - if (!unmap) break; - *result = WINPROC_UnmapMsg32ATo32W( hwnd, msg, wParam, lParam, *result, - (callback == call_window_proc) ? arg : NULL /*FIXME: hack*/ ); break; } return ret;

1 0

Alexandre Julliard : user: Added fast A-> W mapping for WM_CHAR and related messages.
by Alexandre Julliard 22 May '06

22 May '06

Module: wine Branch: refs/heads/master Commit: 34610d1150db66a300ac859e95d539b54b13139a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=34610d1150db66a300ac859… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 20 18:57:36 2006 +0200 user: Added fast A->W mapping for WM_CHAR and related messages. --- dlls/user/winproc.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index 99347f1..ae5b864 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -775,20 +775,6 @@ static INT WINPROC_MapMsg32ATo32W( HWND case LB_GETTEXTLEN: return 1; /* need to map result */ - case WM_CHARTOITEM: - case WM_MENUCHAR: - case WM_CHAR: - case WM_DEADCHAR: - case WM_SYSCHAR: - case WM_SYSDEADCHAR: - case EM_SETPASSWORDCHAR: - *pwparam = map_wparam_char_AtoW( *pwparam, 1 ); - return 0; - - case WM_IME_CHAR: - *pwparam = map_wparam_char_AtoW( *pwparam, 2 ); - return 0; - case WM_PAINTCLIPBOARD: case WM_SIZECLIPBOARD: FIXME_(msg)("message %s (0x%x) needs translation, please report\n", SPY_GetMsgName(msg, hwnd), msg ); @@ -2704,6 +2690,20 @@ LRESULT WINPROC_CallProcAtoW( winproc_ca } break; + case WM_CHARTOITEM: + case WM_MENUCHAR: + case WM_CHAR: + case WM_DEADCHAR: + case WM_SYSCHAR: + case WM_SYSDEADCHAR: + case EM_SETPASSWORDCHAR: + ret = callback( hwnd, msg, map_wparam_char_AtoW(wParam,1), lParam, result, arg ); + break; + + case WM_IME_CHAR: + ret = callback( hwnd, msg, map_wparam_char_AtoW(wParam,2), lParam, result, arg ); + break; + default: if( (unmap = WINPROC_MapMsg32ATo32W( hwnd, msg, &wParam, &lParam )) == -1) { ERR_(msg)("Message translation failed. (msg=%s,wp=%08x,lp=%08lx)\n",

1 0

Alexandre Julliard : user: Added fast A-> W mapping for LB_GETTEXT and CB_GETLBTEXT.
by Alexandre Julliard 22 May '06

22 May '06

Module: wine Branch: refs/heads/master Commit: 19b428755cccd3b70513e36a4680ad9c81f575ae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=19b428755cccd3b70513e36… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 20 18:55:34 2006 +0200 user: Added fast A->W mapping for LB_GETTEXT and CB_GETLBTEXT. --- dlls/user/winproc.c | 41 ++++++++++++++++++----------------------- 1 files changed, 18 insertions(+), 23 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index 8e71bfc..470bbce 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -775,17 +775,6 @@ static INT WINPROC_MapMsg32ATo32W( HWND case LB_GETTEXTLEN: return 1; /* need to map result */ - case LB_GETTEXT: /* FIXME: fixed sized buffer */ - case CB_GETLBTEXT: - if ( WINPROC_TestLBForStr( hwnd, msg )) - { - LPARAM *ptr = HeapAlloc( GetProcessHeap(), 0, 512 * sizeof(WCHAR) + sizeof(LPARAM) ); - if (!ptr) return -1; - *ptr++ = *plparam; /* Store previous lParam */ - *plparam = (LPARAM)ptr; - } - return 1; - /* Multiline edit */ case EM_GETLINE: { WORD len = (WORD)*plparam; @@ -885,18 +874,6 @@ static LRESULT WINPROC_UnmapMsg32ATo32W( HeapFree( GetProcessHeap(), 0, (void *)lParam ); break; - case LB_GETTEXT: - case CB_GETLBTEXT: - if ( WINPROC_TestLBForStr( hwnd, msg )) - { - LPARAM *ptr = (LPARAM *)lParam - 1; - if (result >= 0) - result = WideCharToMultiByte( CP_ACP, 0, (LPWSTR)lParam, -1, - (LPSTR)*ptr, 0x7fffffff, NULL, NULL ) - 1; - HeapFree( GetProcessHeap(), 0, ptr ); - } - break; - /* Multiline edit */ case EM_GETLINE: { @@ -2713,6 +2690,24 @@ LRESULT WINPROC_CallProcAtoW( winproc_ca } break; + case LB_GETTEXT: + case CB_GETLBTEXT: + if (lParam && WINPROC_TestLBForStr( hwnd, msg )) + { + WCHAR buffer[512]; /* FIXME: fixed sized buffer */ + + ret = callback( hwnd, msg, wParam, (LPARAM)buffer, result, arg ); + if (*result >= 0) + { + DWORD len; + RtlUnicodeToMultiByteN( (LPSTR)lParam, ~0u, &len, + buffer, (strlenW(buffer) + 1) * sizeof(WCHAR) ); + *result = len - 1; + } + } + else ret = callback( hwnd, msg, wParam, lParam, result, arg ); + break; + default: if( (unmap = WINPROC_MapMsg32ATo32W( hwnd, msg, &wParam, &lParam )) == -1) { ERR_(msg)("Message translation failed. (msg=%s,wp=%08x,lp=%08lx)\n",

1 0

Alexandre Julliard : user: Added fast A->W mapping for EM_GETLINE.
by Alexandre Julliard 22 May '06

22 May '06

Module: wine Branch: refs/heads/master Commit: 3f4a2a5bfc7894c3e57f41be7ce45d8a755a521f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3f4a2a5bfc7894c3e57f41b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 20 18:57:11 2006 +0200 user: Added fast A->W mapping for EM_GETLINE. --- dlls/user/winproc.c | 44 ++++++++++++++++++++------------------------ 1 files changed, 20 insertions(+), 24 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index 470bbce..99347f1 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -775,17 +775,6 @@ static INT WINPROC_MapMsg32ATo32W( HWND case LB_GETTEXTLEN: return 1; /* need to map result */ -/* Multiline edit */ - case EM_GETLINE: - { WORD len = (WORD)*plparam; - LPARAM *ptr = HeapAlloc( GetProcessHeap(), 0, sizeof(LPARAM) + sizeof (WORD) + len*sizeof(WCHAR) ); - if (!ptr) return -1; - *ptr++ = *plparam; /* Store previous lParam */ - *((WORD *) ptr) = len; /* Store the length */ - *plparam = (LPARAM)ptr; - } - return 1; - case WM_CHARTOITEM: case WM_MENUCHAR: case WM_CHAR: @@ -873,18 +862,6 @@ static LRESULT WINPROC_UnmapMsg32ATo32W( case EM_REPLACESEL: HeapFree( GetProcessHeap(), 0, (void *)lParam ); break; - -/* Multiline edit */ - case EM_GETLINE: - { - LPARAM * ptr = (LPARAM *)lParam - 1; /* get the old lParam */ - WORD len = *(WORD *) lParam; - result = WideCharToMultiByte( CP_ACP, 0, (LPWSTR)lParam, result, - (LPSTR)*ptr, len, NULL, NULL ); - if (result < len) ((LPSTR)*ptr)[result] = 0; - HeapFree( GetProcessHeap(), 0, ptr ); - } - break; } return result; } @@ -2708,6 +2685,25 @@ LRESULT WINPROC_CallProcAtoW( winproc_ca else ret = callback( hwnd, msg, wParam, lParam, result, arg ); break; + case EM_GETLINE: + { + WCHAR *ptr, buffer[512]; + WORD len = *(WORD *)lParam; + + if (!(ptr = get_buffer( buffer, sizeof(buffer), len * sizeof(WCHAR) ))) break; + *((WORD *)ptr) = len; /* store the length */ + ret = callback( hwnd, msg, wParam, (LPARAM)ptr, result, arg ); + if (*result) + { + DWORD reslen; + RtlUnicodeToMultiByteN( (LPSTR)lParam, len, &reslen, ptr, *result * sizeof(WCHAR) ); + if (reslen < len) ((LPSTR)lParam)[reslen] = 0; + *result = reslen; + } + free_buffer( buffer, ptr ); + } + break; + default: if( (unmap = WINPROC_MapMsg32ATo32W( hwnd, msg, &wParam, &lParam )) == -1) { ERR_(msg)("Message translation failed. (msg=%s,wp=%08x,lp=%08lx)\n", @@ -2911,7 +2907,7 @@ static LRESULT WINPROC_CallProcWtoA( win if (*result) { DWORD reslen; - RtlMultiByteToUnicodeN( (LPWSTR)lParam, len*sizeof(WCHAR), &reslen, buffer, *result ); + RtlMultiByteToUnicodeN( (LPWSTR)lParam, len*sizeof(WCHAR), &reslen, ptr, *result ); *result = reslen / sizeof(WCHAR); if (*result < len) ((LPWSTR)lParam)[*result] = 0; }

1 0