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

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

22 May '06

Module: wine Branch: refs/heads/master Commit: 899133d7f726d9350ace45c5fc3d5e914e1de19c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=899133d7f726d9350ace45c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 20 18:48:04 2006 +0200 user: Added fast A->W mapping for WM_CREATE and WM_NCCREATE. --- dlls/user/winproc.c | 158 +++++++++++++++++++++++---------------------------- 1 files changed, 71 insertions(+), 87 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index 0289664..5a5532c 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -67,6 +67,17 @@ static CRITICAL_SECTION_DEBUG critsect_d }; static CRITICAL_SECTION winproc_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; +static inline void *get_buffer( void *static_buffer, size_t size, size_t need ) +{ + if (size >= need) return static_buffer; + return HeapAlloc( GetProcessHeap(), 0, need ); +} + +static inline void free_buffer( void *static_buffer, void *buffer ) +{ + if (buffer != static_buffer) HeapFree( GetProcessHeap(), 0, buffer ); +} + /* map a Unicode string to a 16-bit pointer */ inline static SEGPTR map_str_32W_to_16( LPCWSTR str ) { @@ -763,50 +774,6 @@ static INT WINPROC_MapMsg32ATo32W( HWND case CB_GETLBTEXTLEN: case LB_GETTEXTLEN: return 1; /* need to map result */ - case WM_NCCREATE: - case WM_CREATE: - { - UNICODE_STRING usBuffer; - struct s - { CREATESTRUCTW cs; /* new structure */ - LPCWSTR lpszName; /* allocated Name */ - LPCWSTR lpszClass; /* allocated Class */ - }; - - struct s *xs = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct s)); - if (!xs) return -1; - xs->cs = *(CREATESTRUCTW *)*plparam; - if (HIWORD(xs->cs.lpszName)) - { - RtlCreateUnicodeStringFromAsciiz(&usBuffer,(LPCSTR)xs->cs.lpszName); - xs->lpszName = xs->cs.lpszName = usBuffer.Buffer; - } - if (HIWORD(xs->cs.lpszClass)) - { - RtlCreateUnicodeStringFromAsciiz(&usBuffer,(LPCSTR)xs->cs.lpszClass); - xs->lpszClass = xs->cs.lpszClass = usBuffer.Buffer; - } - - if (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_MDICHILD) - { - MDICREATESTRUCTW *mdi_cs = HeapAlloc(GetProcessHeap(), 0, sizeof(*mdi_cs)); - *mdi_cs = *(MDICREATESTRUCTW *)xs->cs.lpCreateParams; - if (HIWORD(mdi_cs->szTitle)) - { - RtlCreateUnicodeStringFromAsciiz(&usBuffer, (LPCSTR)mdi_cs->szTitle); - mdi_cs->szTitle = usBuffer.Buffer; - } - if (HIWORD(mdi_cs->szClass)) - { - RtlCreateUnicodeStringFromAsciiz(&usBuffer, (LPCSTR)mdi_cs->szClass); - mdi_cs->szClass = usBuffer.Buffer; - } - xs->cs.lpCreateParams = mdi_cs; - } - - *plparam = (LPARAM)xs; - } - return 1; case WM_MDICREATE: { MDICREATESTRUCTW *cs = HeapAlloc( GetProcessHeap(), 0, sizeof(*cs) ); @@ -947,30 +914,6 @@ static LRESULT WINPROC_UnmapMsg32ATo32W( } } break; - case WM_NCCREATE: - case WM_CREATE: - { - struct s - { CREATESTRUCTW cs; /* new structure */ - LPWSTR lpszName; /* allocated Name */ - LPWSTR lpszClass; /* allocated Class */ - }; - struct s *xs = (struct s *)lParam; - HeapFree( GetProcessHeap(), 0, xs->lpszName ); - HeapFree( GetProcessHeap(), 0, xs->lpszClass ); - - if (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_MDICHILD) - { - MDICREATESTRUCTW *mdi_cs = (MDICREATESTRUCTW *)xs->cs.lpCreateParams; - if (HIWORD(mdi_cs->szTitle)) - HeapFree(GetProcessHeap(), 0, (LPVOID)mdi_cs->szTitle); - if (HIWORD(mdi_cs->szClass)) - HeapFree(GetProcessHeap(), 0, (LPVOID)mdi_cs->szClass); - HeapFree(GetProcessHeap(), 0, mdi_cs); - } - HeapFree( GetProcessHeap(), 0, xs ); - } - break; case WM_MDICREATE: { @@ -2684,36 +2627,77 @@ static void WINPROC_UnmapMsg32WTo16( HWN LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *result, void *arg ) { - LRESULT ret; + LRESULT ret = 0; int unmap; TRACE_(msg)("(hwnd=%p,msg=%s,wp=%08x,lp=%08lx)\n", hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam); - 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) + switch(msg) + { + case WM_NCCREATE: + case WM_CREATE: + { + WCHAR *ptr, buffer[512]; + CREATESTRUCTA *csA = (CREATESTRUCTA *)lParam; + CREATESTRUCTW csW = *(CREATESTRUCTW *)csA; + MDICREATESTRUCTW mdi_cs; + DWORD name_lenA = 0, name_lenW = 0, class_lenA = 0, class_lenW = 0; + + if (HIWORD(csA->lpszClass)) + { + class_lenA = strlen(csA->lpszClass) + 1; + RtlMultiByteToUnicodeSize( &class_lenW, csA->lpszClass, class_lenA ); + } + if (HIWORD(csA->lpszName)) + { + name_lenA = strlen(csA->lpszName) + 1; + RtlMultiByteToUnicodeSize( &name_lenW, csA->lpszName, name_lenA ); + } + + if (!(ptr = get_buffer( buffer, sizeof(buffer), class_lenW + name_lenW ))) break; + + if (class_lenW) + { + csW.lpszClass = ptr; + RtlMultiByteToUnicodeN( ptr, class_lenW, NULL, csA->lpszClass, class_lenA ); + } + if (name_lenW) + { + csW.lpszName = ptr + class_lenW/sizeof(WCHAR); + RtlMultiByteToUnicodeN( ptr + class_lenW/sizeof(WCHAR), name_lenW, NULL, + csA->lpszName, name_lenA ); + } + + if (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_MDICHILD) + { + mdi_cs = *(MDICREATESTRUCTW *)csA->lpCreateParams; + mdi_cs.szTitle = csW.lpszName; + mdi_cs.szClass = csW.lpszClass; + csW.lpCreateParams = &mdi_cs; + } + + ret = callback( hwnd, msg, wParam, (LPARAM)&csW, result, arg ); + 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", + 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; } -static inline void *get_buffer( void *static_buffer, size_t size, size_t need ) -{ - if (size >= need) return static_buffer; - return HeapAlloc( GetProcessHeap(), 0, need ); -} - -static inline void free_buffer( void *static_buffer, void *buffer ) -{ - if (buffer != static_buffer) HeapFree( GetProcessHeap(), 0, buffer ); -} - /********************************************************************** * WINPROC_CallProcWtoA *

1 0

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

22 May '06

Module: wine Branch: refs/heads/master Commit: 3e195d438258b3bbcf5aa7f1f3e3d3bbfa33d097 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3e195d438258b3bbcf5aa7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 20 18:49:40 2006 +0200 user: Added fast A->W mapping for WM_MDICREATE. --- dlls/user/winproc.c | 69 ++++++++++++++++++++++++++++----------------------- 1 files changed, 38 insertions(+), 31 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index 5a5532c..0dfdf77 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -774,26 +774,6 @@ static INT WINPROC_MapMsg32ATo32W( HWND case CB_GETLBTEXTLEN: case LB_GETTEXTLEN: return 1; /* need to map result */ - case WM_MDICREATE: - { - MDICREATESTRUCTW *cs = HeapAlloc( GetProcessHeap(), 0, sizeof(*cs) ); - if (!cs) return -1; - *cs = *(MDICREATESTRUCTW *)*plparam; - if (HIWORD(cs->szClass)) - { - UNICODE_STRING usBuffer; - RtlCreateUnicodeStringFromAsciiz(&usBuffer,(LPCSTR)cs->szClass); - cs->szClass = usBuffer.Buffer; - } - if (HIWORD(cs->szTitle)) - { - UNICODE_STRING usBuffer; - RtlCreateUnicodeStringFromAsciiz(&usBuffer,(LPCSTR)cs->szTitle); - cs->szTitle = usBuffer.Buffer; - } - *plparam = (LPARAM)cs; - } - return 1; /* Listbox / Combobox */ case LB_ADDSTRING: @@ -915,17 +895,6 @@ static LRESULT WINPROC_UnmapMsg32ATo32W( } break; - case WM_MDICREATE: - { - MDICREATESTRUCTW *cs = (MDICREATESTRUCTW *)lParam; - if (HIWORD(cs->szTitle)) - HeapFree( GetProcessHeap(), 0, (LPVOID)cs->szTitle ); - if (HIWORD(cs->szClass)) - HeapFree( GetProcessHeap(), 0, (LPVOID)cs->szClass ); - HeapFree( GetProcessHeap(), 0, cs ); - } - break; - case WM_SETTEXT: case WM_WININICHANGE: case WM_DEVMODECHANGE: @@ -2682,6 +2651,44 @@ LRESULT WINPROC_CallProcAtoW( winproc_ca } break; + case WM_MDICREATE: + { + WCHAR *ptr, buffer[512]; + DWORD title_lenA = 0, title_lenW = 0, class_lenA = 0, class_lenW = 0; + MDICREATESTRUCTA *csA = (MDICREATESTRUCTA *)lParam; + MDICREATESTRUCTW csW; + + memcpy( &csW, csA, sizeof(csW) ); + + if (HIWORD(csA->szTitle)) + { + title_lenA = strlen(csA->szTitle) + 1; + RtlMultiByteToUnicodeSize( &title_lenW, csA->szTitle, title_lenA ); + } + if (HIWORD(csA->szClass)) + { + class_lenA = strlen(csA->szClass) + 1; + RtlMultiByteToUnicodeSize( &class_lenW, csA->szClass, class_lenA ); + } + + if (!(ptr = get_buffer( buffer, sizeof(buffer), title_lenW + class_lenW ))) break; + + if (title_lenW) + { + csW.szTitle = ptr; + RtlMultiByteToUnicodeN( ptr, title_lenW, NULL, csA->szTitle, title_lenA ); + } + if (class_lenW) + { + csW.szClass = ptr + title_lenW/sizeof(WCHAR); + RtlMultiByteToUnicodeN( ptr + title_lenW/sizeof(WCHAR), class_lenW, NULL, + csA->szClass, class_lenA ); + } + ret = callback( hwnd, msg, wParam, (LPARAM)&csW, result, arg ); + 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 WM_GETTEXT and WM_ASKCBFORNAME.
by Alexandre Julliard 22 May '06

22 May '06

Module: wine Branch: refs/heads/master Commit: 91b278b8119eb251440bde325fbf44568666eb1b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=91b278b8119eb251440bde3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 20 18:53:16 2006 +0200 user: Added fast A->W mapping for WM_GETTEXT and WM_ASKCBFORNAME. --- dlls/user/winproc.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index 0dfdf77..a693fe7 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -2689,6 +2689,25 @@ LRESULT WINPROC_CallProcAtoW( winproc_ca } break; + case WM_GETTEXT: + case WM_ASKCBFORMATNAME: + { + WCHAR *ptr, buffer[512]; + LPSTR str = (LPSTR)lParam; + DWORD len = wParam * sizeof(WCHAR); + + if (!(ptr = get_buffer( buffer, sizeof(buffer), len ))) break; + ret = callback( hwnd, msg, wParam, (LPARAM)ptr, result, arg ); + if (*result && wParam) + { + RtlUnicodeToMultiByteN( str, wParam - 1, &len, ptr, strlenW(ptr) * sizeof(WCHAR) ); + str[len] = 0; + *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 WM_SETTEXT and related messages.
by Alexandre Julliard 22 May '06

22 May '06

Module: wine Branch: refs/heads/master Commit: 4dd1cce203ca936611e7f93355b51b307f6b6120 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4dd1cce203ca936611e7f93… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 20 18:54:25 2006 +0200 user: Added fast A->W mapping for WM_SETTEXT and related messages. --- dlls/user/winproc.c | 75 +++++++++++++++++++++++++++------------------------ 1 files changed, 40 insertions(+), 35 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index a693fe7..8e71bfc 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -775,26 +775,6 @@ static INT WINPROC_MapMsg32ATo32W( HWND case LB_GETTEXTLEN: return 1; /* need to map result */ -/* Listbox / Combobox */ - case LB_ADDSTRING: - case LB_INSERTSTRING: - case LB_FINDSTRING: - case LB_FINDSTRINGEXACT: - case LB_SELECTSTRING: - case CB_ADDSTRING: - case CB_INSERTSTRING: - case CB_FINDSTRINGEXACT: - case CB_FINDSTRING: - case CB_SELECTSTRING: - if(!*plparam) return 0; - if ( WINPROC_TestLBForStr( hwnd, msg )) - { - UNICODE_STRING usBuffer; - RtlCreateUnicodeStringFromAsciiz(&usBuffer,(LPCSTR)*plparam); - *plparam = (LPARAM)usBuffer.Buffer; - } - return (*plparam ? 1 : -1); - case LB_GETTEXT: /* FIXME: fixed sized buffer */ case CB_GETLBTEXT: if ( WINPROC_TestLBForStr( hwnd, msg )) @@ -905,21 +885,6 @@ static LRESULT WINPROC_UnmapMsg32ATo32W( HeapFree( GetProcessHeap(), 0, (void *)lParam ); break; -/* Listbox / Combobox */ - case LB_ADDSTRING: - case LB_INSERTSTRING: - case LB_FINDSTRING: - case LB_FINDSTRINGEXACT: - case LB_SELECTSTRING: - case CB_ADDSTRING: - case CB_INSERTSTRING: - case CB_FINDSTRING: - case CB_FINDSTRINGEXACT: - case CB_SELECTSTRING: - if ( WINPROC_TestLBForStr( hwnd, msg )) - HeapFree( GetProcessHeap(), 0, (void *)lParam ); - break; - case LB_GETTEXT: case CB_GETLBTEXT: if ( WINPROC_TestLBForStr( hwnd, msg )) @@ -2708,6 +2673,46 @@ LRESULT WINPROC_CallProcAtoW( winproc_ca } break; + case LB_ADDSTRING: + case LB_INSERTSTRING: + case LB_FINDSTRING: + case LB_FINDSTRINGEXACT: + case LB_SELECTSTRING: + case CB_ADDSTRING: + case CB_INSERTSTRING: + case CB_FINDSTRING: + case CB_FINDSTRINGEXACT: + case CB_SELECTSTRING: + if (!lParam || !WINPROC_TestLBForStr( hwnd, msg )) + { + ret = callback( hwnd, msg, wParam, lParam, result, arg ); + break; + } + /* fall through */ + case WM_SETTEXT: + case WM_WININICHANGE: + case WM_DEVMODECHANGE: + case CB_DIR: + case LB_DIR: + case LB_ADDFILE: + case EM_REPLACESEL: + if (!lParam) ret = callback( hwnd, msg, wParam, lParam, result, arg ); + else + { + WCHAR *ptr, buffer[512]; + LPCSTR strA = (LPCSTR)lParam; + DWORD lenW, lenA = strlen(strA) + 1; + + RtlMultiByteToUnicodeSize( &lenW, strA, lenA ); + if ((ptr = get_buffer( buffer, sizeof(buffer), lenW ))) + { + RtlMultiByteToUnicodeN( ptr, lenW, NULL, strA, lenA ); + ret = callback( hwnd, msg, wParam, (LPARAM)ptr, result, arg ); + 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

Peter Beutner : d3d8: Fix GetDesc and GetLevelDesc for surfaces and textures.
by Alexandre Julliard 20 May '06

20 May '06

Module: wine Branch: refs/heads/master Commit: 5c4a1fc8deae007c2469394ebccbffc878a73662 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5c4a1fc8deae007c2469394… Author: Peter Beutner <p.beutner(a)gmx.net> Date: Fri May 19 14:17:56 2006 +0200 d3d8: Fix GetDesc and GetLevelDesc for surfaces and textures. In DX8 the D3DSURFACE_DESC structure has a size field which needs to be set. --- dlls/d3d8/cubetexture.c | 5 ++--- dlls/d3d8/surface.c | 5 ++--- dlls/d3d8/texture.c | 5 ++--- dlls/d3d8/volume.c | 5 ++--- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 2498855..3f742fe 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -134,16 +134,15 @@ DWORD WINAPI IDirect3DCubeTexture8Impl_G HRESULT WINAPI IDirect3DCubeTexture8Impl_GetLevelDesc(LPDIRECT3DCUBETEXTURE8 iface, UINT Level, D3DSURFACE_DESC *pDesc) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; WINED3DSURFACE_DESC wined3ddesc; - UINT tmpInt = -1; TRACE("(%p) Relay\n", This); - /* As d3d8 and d3d8 structures differ, pass in ptrs to where data needs to go */ + /* As d3d8 and d3d9 structures differ, pass in ptrs to where data needs to go */ wined3ddesc.Format = (WINED3DFORMAT *)&pDesc->Format; wined3ddesc.Type = (WINED3DRESOURCETYPE *)&pDesc->Type; wined3ddesc.Usage = &pDesc->Usage; wined3ddesc.Pool = (WINED3DPOOL *) &pDesc->Pool; - wined3ddesc.Size = &tmpInt; + wined3ddesc.Size = &pDesc->Size; wined3ddesc.MultiSampleType = (WINED3DMULTISAMPLE_TYPE *) &pDesc->MultiSampleType; wined3ddesc.MultiSampleQuality = NULL; /* DirectX9 only */ wined3ddesc.Width = &pDesc->Width; diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 4153ea1..d264ac2 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -156,16 +156,15 @@ HRESULT WINAPI IDirect3DSurface8Impl_Get HRESULT WINAPI IDirect3DSurface8Impl_GetDesc(LPDIRECT3DSURFACE8 iface, D3DSURFACE_DESC *pDesc) { IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; WINED3DSURFACE_DESC wined3ddesc; - UINT tmpInt = -1; TRACE("(%p) Relay\n", This); - /* As d3d8 and d3d8 structures differ, pass in ptrs to where data needs to go */ + /* As d3d8 and d3d9 structures differ, pass in ptrs to where data needs to go */ memset(&wined3ddesc, 0, sizeof(wined3ddesc)); wined3ddesc.Format = (WINED3DFORMAT *)&pDesc->Format; wined3ddesc.Type = (WINED3DRESOURCETYPE *)&pDesc->Type; wined3ddesc.Usage = &pDesc->Usage; wined3ddesc.Pool = (WINED3DPOOL *) &pDesc->Pool; - wined3ddesc.Size = &tmpInt; + wined3ddesc.Size = &pDesc->Size; wined3ddesc.MultiSampleType = (WINED3DMULTISAMPLE_TYPE *) &pDesc->MultiSampleType; wined3ddesc.Width = &pDesc->Width; wined3ddesc.Height = &pDesc->Height; diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 736673a..c379489 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -135,16 +135,15 @@ HRESULT WINAPI IDirect3DTexture8Impl_Get IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; WINED3DSURFACE_DESC wined3ddesc; - UINT tmpInt = -1; TRACE("(%p) Relay\n", This); - /* As d3d8 and d3d8 structures differ, pass in ptrs to where data needs to go */ + /* As d3d8 and d3d9 structures differ, pass in ptrs to where data needs to go */ memset(&wined3ddesc, 0, sizeof(wined3ddesc)); wined3ddesc.Format = (WINED3DFORMAT *)&pDesc->Format; wined3ddesc.Type = (WINED3DRESOURCETYPE *)&pDesc->Type; wined3ddesc.Usage = &pDesc->Usage; wined3ddesc.Pool = (WINED3DPOOL *) &pDesc->Pool; - wined3ddesc.Size = &tmpInt; /* required for d3d8 */ + wined3ddesc.Size = &pDesc->Size; wined3ddesc.MultiSampleType = (WINED3DMULTISAMPLE_TYPE *) &pDesc->MultiSampleType; wined3ddesc.Width = &pDesc->Width; wined3ddesc.Height = &pDesc->Height; diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index cbde666..bb7f5b1 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -132,16 +132,15 @@ HRESULT WINAPI IDirect3DVolume8Impl_GetC HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(LPDIRECT3DVOLUME8 iface, D3DVOLUME_DESC *pDesc) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; WINED3DVOLUME_DESC wined3ddesc; - UINT tmpInt = -1; TRACE("(%p) Relay\n", This); - /* As d3d8 and d3d8 structures differ, pass in ptrs to where data needs to go */ + /* As d3d8 and d3d9 structures differ, pass in ptrs to where data needs to go */ wined3ddesc.Format = (WINED3DFORMAT *)&pDesc->Format; wined3ddesc.Type = (WINED3DRESOURCETYPE *)&pDesc->Type; wined3ddesc.Usage = &pDesc->Usage; wined3ddesc.Pool = (WINED3DPOOL *) &pDesc->Pool; - wined3ddesc.Size = &tmpInt; + wined3ddesc.Size = &pDesc->Size; wined3ddesc.Width = &pDesc->Width; wined3ddesc.Height = &pDesc->Height; wined3ddesc.Depth = &pDesc->Depth;

1 0

Jason Green : wined3d: Simplify generate_base_shader() when checking for USING_GLSL usage.
by Alexandre Julliard 20 May '06

20 May '06

Module: wine Branch: refs/heads/master Commit: 4a1375bdd6c711044887110b31bdadfc889ce8f9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4a1375bdd6c711044887110… Author: Jason Green <jave27(a)gmail.com> Date: Thu May 18 13:43:32 2006 -0400 wined3d: Simplify generate_base_shader() when checking for USING_GLSL usage. --- dlls/wined3d/baseshader.c | 29 ++++++++--------------------- 1 files changed, 8 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 98fa795..6629d58 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -551,6 +551,7 @@ void generate_base_shader( IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; const DWORD *pToken = pFunction; const SHADER_OPCODE *curOpcode = NULL; + SHADER_HANDLER hw_fct = NULL; DWORD opcode_token; DWORD i; @@ -568,10 +569,12 @@ void generate_base_shader( */ /* Pre-declare registers */ - if (USING_GLSL) + if (USING_GLSL) { generate_glsl_declarations(iface, buffer); - else + shader_addline(buffer, "void main() {\n"); + } else { generate_arb_declarations(iface, buffer); + } /* Second pass, process opcodes */ if (NULL != pToken) { @@ -595,28 +598,15 @@ void generate_base_shader( /* Read opcode */ opcode_token = *pToken++; curOpcode = shader_get_opcode(iface, opcode_token); + hw_fct = USING_GLSL ? curOpcode->hw_glsl_fct : curOpcode->hw_fct; /* Unknown opcode and its parameters */ if (NULL == curOpcode) { FIXME("Unrecognized opcode: token=%08lX\n", opcode_token); pToken += shader_skip_unrecognized(iface, pToken); - /* Using GLSL & no generator function exists */ - } else if (USING_GLSL && curOpcode->hw_glsl_fct == NULL) { - - FIXME("Token %s is not yet implemented with GLSL\n", curOpcode->name); - pToken += shader_skip_opcode(This, curOpcode, opcode_token); - - /* Unhandled opcode in ARB */ - } else if ( !USING_GLSL && GLNAME_REQUIRE_GLSL == curOpcode->glname) { - - FIXME("Token %s requires greater functionality than " - "Vertex or Fragment_Program_ARB supports\n", curOpcode->name); - pToken += shader_skip_opcode(This, curOpcode, opcode_token); - /* If a generator function is set for current shader target, use it */ - } else if ((!USING_GLSL && curOpcode->hw_fct != NULL) || - (USING_GLSL && curOpcode->hw_glsl_fct != NULL)) { + } else if (hw_fct != NULL) { SHADER_OPCODE_ARG hw_arg; @@ -656,10 +646,7 @@ void generate_base_shader( } /* Call appropriate function for output target */ - if (USING_GLSL) - curOpcode->hw_glsl_fct(&hw_arg); - else - curOpcode->hw_fct(&hw_arg); + hw_fct(&hw_arg); } else {

1 0

Robert Shearman : rpcrt4: Handle pointers to context handles in the stubless code.
by Alexandre Julliard 20 May '06

20 May '06

Module: wine Branch: refs/heads/master Commit: 6e7d06ad3484f23f75a25e558d09461a8ea94499 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6e7d06ad3484f23f75a25e5… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri May 19 16:04:23 2006 +0100 rpcrt4: Handle pointers to context handles in the stubless code. Implement check for NULL context handles if requested. --- dlls/rpcrt4/ndr_stubless.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 0131034..25d8fdd 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -470,8 +470,23 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_ST case RPC_FC_BIND_CONTEXT: /* explicit context */ { NDR_EHD_CONTEXT * pDesc = (NDR_EHD_CONTEXT *)&pFormat[current_offset]; + NDR_CCONTEXT context_handle; TRACE("Explicit bind context\n"); - hBinding = NDRCContextBinding(*(NDR_CCONTEXT *)ARG_FROM_OFFSET(args, pDesc->offset)); + if (pDesc->flags & HANDLE_PARAM_IS_VIA_PTR) + { + TRACE("\tHANDLE_PARAM_IS_VIA_PTR\n"); + context_handle = **(NDR_CCONTEXT **)ARG_FROM_OFFSET(args, pDesc->offset); + } + else + context_handle = *(NDR_CCONTEXT *)ARG_FROM_OFFSET(args, pDesc->offset); + if ((pDesc->flags & NDR_CONTEXT_HANDLE_CANNOT_BE_NULL) && + !context_handle) + { + ERR("null context handle isn't allowed\n"); + RpcRaiseException(RPC_X_SS_IN_NULL_CONTEXT); + return 0; + } + hBinding = NDRCContextBinding(context_handle); /* FIXME: should we store this structure in stubMsg.pContext? */ current_offset += sizeof(NDR_EHD_CONTEXT); break;

1 0

Jason Green : wined3d: Move PARAM C[] program.env[] into baseshader and out of vertex shaders.
by Alexandre Julliard 20 May '06

20 May '06

Module: wine Branch: refs/heads/master Commit: 683e5bfc55ecbcbc924b947d4f57a0d745605a47 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=683e5bfc55ecbcbc924b947… Author: Jason Green <jave27(a)gmail.com> Date: Thu May 18 13:42:37 2006 -0400 wined3d: Move PARAM C[] program.env[] into baseshader and out of vertex shaders. --- dlls/wined3d/baseshader.c | 5 +++++ dlls/wined3d/pixelshader.c | 2 +- dlls/wined3d/vertexshader.c | 4 ---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index f9f939f..98fa795 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -523,6 +523,11 @@ void generate_arb_declarations(IWineD3DB if (This->baseShader.textures_used & (1 << i)) shader_addline(buffer, "MOV T%lu, fragment.texcoord[%lu];\n", i, i); } + + /* Need to PARAM the environment parameters (constants) so we can use relative addressing */ + shader_addline(buffer, "PARAM C[%d] = { program.env[0..%d] };\n", + This->baseShader.limits.constant_float, + This->baseShader.limits.constant_float - 1); } /** Generate the variable & register declarations for the GLSL diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index bafcd28..05241d2 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -764,7 +764,7 @@ inline static void get_register_name(con if (constants[reg]) sprintf(regstr, "C%lu", reg); else - sprintf(regstr, "program.env[%lu]", reg); + sprintf(regstr, "C[%lu]", reg); break; case D3DSPR_TEXTURE: /* case D3DSPR_ADDR: */ sprintf(regstr,"T%lu", reg); diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 58a1963..29a92d1 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -1073,10 +1073,6 @@ #endif This->baseShader.limits.constant_float = min(95, This->baseShader.limits.constant_float); - shader_addline(&buffer, "PARAM C[%d] = { program.env[0..%d] };\n", - This->baseShader.limits.constant_float, - This->baseShader.limits.constant_float - 1); - /** Call the base shader generation routine to generate most of the vertex shader string for us */ generate_base_shader( (IWineD3DBaseShader*) This, &buffer, pFunction);

1 0

Robert Shearman : rpcrt4: Use macros to generate the code for unmarshaling base types.
by Alexandre Julliard 20 May '06

20 May '06

Module: wine Branch: refs/heads/master Commit: a2767e8d71f5b2f6a7456a53c2cf4bf816e59ef8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a2767e8d71f5b2f6a7456a5… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri May 19 16:02:59 2006 +0100 rpcrt4: Use macros to generate the code for unmarshaling base types. --- dlls/rpcrt4/ndr_marshall.c | 29 ++++++++++++----------------- 1 files changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 99777ea..a38ddf7 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -4106,49 +4106,43 @@ static unsigned char *WINAPI NdrBaseType TRACE("*ppMemory: %p\n", *ppMemory); +#define BASE_TYPE_UNMARSHALL(type) \ + ALIGN_POINTER(pStubMsg->Buffer, sizeof(type)); \ + **(type **)ppMemory = *(type *)pStubMsg->Buffer; \ + pStubMsg->Buffer += sizeof(type); + switch(*pFormat) { case RPC_FC_BYTE: case RPC_FC_CHAR: case RPC_FC_SMALL: case RPC_FC_USMALL: - **(UCHAR **)ppMemory = *(UCHAR *)pStubMsg->Buffer; - pStubMsg->Buffer += sizeof(UCHAR); + BASE_TYPE_UNMARSHALL(UCHAR); TRACE("value: 0x%02x\n", **(UCHAR **)ppMemory); break; case RPC_FC_WCHAR: case RPC_FC_SHORT: case RPC_FC_USHORT: - ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT)); - **(USHORT **)ppMemory = *(USHORT *)pStubMsg->Buffer; - pStubMsg->Buffer += sizeof(USHORT); + BASE_TYPE_UNMARSHALL(USHORT); TRACE("value: 0x%04x\n", **(USHORT **)ppMemory); break; case RPC_FC_LONG: case RPC_FC_ULONG: case RPC_FC_ERROR_STATUS_T: case RPC_FC_ENUM32: - ALIGN_POINTER(pStubMsg->Buffer, sizeof(ULONG)); - **(ULONG **)ppMemory = *(ULONG *)pStubMsg->Buffer; - pStubMsg->Buffer += sizeof(ULONG); + BASE_TYPE_UNMARSHALL(ULONG); TRACE("value: 0x%08lx\n", **(ULONG **)ppMemory); break; case RPC_FC_FLOAT: - ALIGN_POINTER(pStubMsg->Buffer, sizeof(float)); - **(float **)ppMemory = *(float *)pStubMsg->Buffer; - pStubMsg->Buffer += sizeof(float); + BASE_TYPE_UNMARSHALL(float); TRACE("value: %f\n", **(float **)ppMemory); break; case RPC_FC_DOUBLE: - ALIGN_POINTER(pStubMsg->Buffer, sizeof(double)); - **(double **)ppMemory = *(double*)pStubMsg->Buffer; - pStubMsg->Buffer += sizeof(double); + BASE_TYPE_UNMARSHALL(double); TRACE("value: %f\n", **(double **)ppMemory); break; case RPC_FC_HYPER: - ALIGN_POINTER(pStubMsg->Buffer, sizeof(ULONGLONG)); - **(ULONGLONG **)ppMemory = *(ULONGLONG *)pStubMsg->Buffer; - pStubMsg->Buffer += sizeof(ULONGLONG); + BASE_TYPE_UNMARSHALL(ULONGLONG); TRACE("value: %s\n", wine_dbgstr_longlong(**(ULONGLONG **)ppMemory)); break; case RPC_FC_ENUM16: @@ -4161,6 +4155,7 @@ static unsigned char *WINAPI NdrBaseType default: FIXME("Unhandled base type: 0x%02x\n", *pFormat); } +#undef BASE_TYPE_UNMARSHALL /* FIXME: what is the correct return value? */

1 0

Robert Shearman : rpcrt4: We don' t need to free object pointers if we are told we must allocate.
by Alexandre Julliard 20 May '06

20 May '06

Module: wine Branch: refs/heads/master Commit: 9c885c918594662d63ee7029bc928a636e85c9fc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9c885c918594662d63ee702… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri May 19 16:04:11 2006 +0100 rpcrt4: We don't need to free object pointers if we are told we must allocate. --- dlls/rpcrt4/ndr_marshall.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index a38ddf7..a787d1f 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -822,7 +822,7 @@ static void PointerUnmarshall(PMIDL_STUB case RPC_FC_OP: /* object pointer - we must free data before overwriting it */ pointer_id = NDR_LOCAL_UINT32_READ(Buffer); TRACE("pointer_id is 0x%08lx\n", pointer_id); - if (*pPointer) + if (!fMustAlloc && *pPointer) FIXME("free object pointer %p\n", *pPointer); break; case RPC_FC_FP:

1 0