May 2007 - Wine-Commits - list.winehq.org

Tim Schwartz : net.exe: Initial stub.
by Alexandre Julliard May 3, 2007

May 3, 2007

Module: wine Branch: master Commit: 451616ee4528c82278c538da9ec5ad439fdcec65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=451616ee4528c82278c538da9… Author: Tim Schwartz <tim(a)sanityinternet.com> Date: Wed May 2 12:30:19 2007 -0500 net.exe: Initial stub. --- .gitignore | 1 + Makefile.in | 2 ++ configure | 3 +++ configure.ac | 1 + programs/Makefile.in | 2 ++ programs/net/Makefile.in | 13 +++++++++++++ programs/net/net.c | 41 +++++++++++++++++++++++++++++++++++++++++ 7 files changed, 63 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 01e88f1..b3331b2 100644 --- a/.gitignore +++ b/.gitignore @@ -756,6 +756,7 @@ programs/iexplore/iexplore programs/msiexec/msiexec programs/msiexec/msiexec.ico programs/msiexec/rsrc.res +programs/net/net programs/notepad/notepad programs/notepad/rsrc.res programs/oleview/oleview diff --git a/Makefile.in b/Makefile.in index 1f8f0c9..30e0581 100644 --- a/Makefile.in +++ b/Makefile.in @@ -449,6 +449,7 @@ ALL_MAKEFILES = \ programs/icinfo/Makefile \ programs/iexplore/Makefile \ programs/msiexec/Makefile \ + programs/net/Makefile \ programs/notepad/Makefile \ programs/oleview/Makefile \ programs/progman/Makefile \ @@ -794,6 +795,7 @@ programs/hh/Makefile: programs/hh/Makefile.in programs/Makeprog.rules programs/icinfo/Makefile: programs/icinfo/Makefile.in programs/Makeprog.rules programs/iexplore/Makefile: programs/iexplore/Makefile.in programs/Makeprog.rules programs/msiexec/Makefile: programs/msiexec/Makefile.in programs/Makeprog.rules +programs/net/Makefile: programs/net/Makefile.in programs/Makeprog.rules programs/notepad/Makefile: programs/notepad/Makefile.in programs/Makeprog.rules programs/oleview/Makefile: programs/oleview/Makefile.in programs/Makeprog.rules programs/progman/Makefile: programs/progman/Makefile.in programs/Makeprog.rules diff --git a/configure b/configure index 71a66ae..44d6f0e 100755 --- a/configure +++ b/configure @@ -20903,6 +20903,8 @@ ac_config_files="$ac_config_files programs/iexplore/Makefile" ac_config_files="$ac_config_files programs/msiexec/Makefile" +ac_config_files="$ac_config_files programs/net/Makefile" + ac_config_files="$ac_config_files programs/notepad/Makefile" ac_config_files="$ac_config_files programs/oleview/Makefile" @@ -21838,6 +21840,7 @@ do "programs/icinfo/Makefile") CONFIG_FILES="$CONFIG_FILES programs/icinfo/Makefile" ;; "programs/iexplore/Makefile") CONFIG_FILES="$CONFIG_FILES programs/iexplore/Makefile" ;; "programs/msiexec/Makefile") CONFIG_FILES="$CONFIG_FILES programs/msiexec/Makefile" ;; + "programs/net/Makefile") CONFIG_FILES="$CONFIG_FILES programs/net/Makefile" ;; "programs/notepad/Makefile") CONFIG_FILES="$CONFIG_FILES programs/notepad/Makefile" ;; "programs/oleview/Makefile") CONFIG_FILES="$CONFIG_FILES programs/oleview/Makefile" ;; "programs/progman/Makefile") CONFIG_FILES="$CONFIG_FILES programs/progman/Makefile" ;; diff --git a/configure.ac b/configure.ac index ddec5f4..b62c0a5 100644 --- a/configure.ac +++ b/configure.ac @@ -1776,6 +1776,7 @@ AC_CONFIG_FILES([programs/hh/Makefile]) AC_CONFIG_FILES([programs/icinfo/Makefile]) AC_CONFIG_FILES([programs/iexplore/Makefile]) AC_CONFIG_FILES([programs/msiexec/Makefile]) +AC_CONFIG_FILES([programs/net/Makefile]) AC_CONFIG_FILES([programs/notepad/Makefile]) AC_CONFIG_FILES([programs/oleview/Makefile]) AC_CONFIG_FILES([programs/progman/Makefile]) diff --git a/programs/Makefile.in b/programs/Makefile.in index f164c0b..ee2d3c7 100644 --- a/programs/Makefile.in +++ b/programs/Makefile.in @@ -17,6 +17,7 @@ SUBDIRS = \ icinfo \ iexplore \ msiexec \ + net \ notepad \ oleview \ progman \ @@ -57,6 +58,7 @@ INSTALLSUBDIRS = \ icinfo \ iexplore \ msiexec \ + net \ notepad \ oleview \ progman \ diff --git a/programs/net/Makefile.in b/programs/net/Makefile.in new file mode 100644 index 0000000..5db7fc0 --- /dev/null +++ b/programs/net/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = net.exe +APPMODE = -mconsole +IMPORTS = kernel32 + +C_SRCS = net.c + +(a)MAKE_PROG_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/programs/net/net.c b/programs/net/net.c new file mode 100644 index 0000000..f77c820 --- /dev/null +++ b/programs/net/net.c @@ -0,0 +1,41 @@ +/* + * Copyright 2007 Tim Schwartz + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> +#include <string.h> + +int main(int argc, char *argv[]) +{ + int ret = 0; + + if (argc < 2) + { + printf("The syntax of this command is:\n\n"); + printf("NET [ HELP ]\n"); + return 1; + } + + if(!strcasecmp(argv[1], "help")) + { + printf("The syntax of this command is:\n\n"); + printf("NET HELP command\n -or-\nNET command /HELP\n\n"); + printf(" Commands available are:\n"); + printf(" NET HELP\n"); + } + return ret; +}

1 0

Andrey Turkin : hhctrl.ocx: Do not try to dereference NULL pointer if CreateHelpViewer failed.
by Alexandre Julliard May 3, 2007

May 3, 2007

Module: wine Branch: master Commit: 38acaccd931ecfd45d6f0f2515d985f257088131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38acaccd931ecfd45d6f0f251… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Wed May 2 20:16:32 2007 +0400 hhctrl.ocx: Do not try to dereference NULL pointer if CreateHelpViewer failed. --- dlls/hhctrl.ocx/hhctrl.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index f65f68b..958edf9 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -107,9 +107,12 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat info = CreateHelpViewer(filename); - res = NavigateToChm(info, info->pCHMInfo->szFile, info->WinType.pszFile); - if(!res) - ReleaseHelpViewer(info); + if (info) + { + res = NavigateToChm(info, info->pCHMInfo->szFile, info->WinType.pszFile); + if(!res) + ReleaseHelpViewer(info); + } return NULL; /* FIXME */ }

1 0

Andrey Turkin : hhctrl.ocx: Update HtmlHelp and its commands definitions, and partially implement data A->W translation.
by Alexandre Julliard May 3, 2007

May 3, 2007

Module: wine Branch: master Commit: 41342a32bbf5c907bd8a0adacef9acd8048c6f4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=41342a32bbf5c907bd8a0adac… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Wed May 2 20:15:58 2007 +0400 hhctrl.ocx: Update HtmlHelp and its commands definitions, and partially implement data A->W translation. --- dlls/hhctrl.ocx/hhctrl.c | 57 ++++++++++++++++++++++++++++++++++++++++----- include/htmlhelp.h | 5 ++- 2 files changed, 53 insertions(+), 9 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index de66a8a..f65f68b 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -78,6 +78,7 @@ static const char *command_to_string(UINT command) X( HH_SET_EXCLUSIVE_FILTER ); X( HH_INITIALIZE ); X( HH_UNINITIALIZE ); + X( HH_SAFE_DISPLAY_TOPIC ); X( HH_PRETRANSLATEMESSAGE ); X( HH_SET_GLOBAL_PROPERTY ); default: return "???"; @@ -88,9 +89,9 @@ static const char *command_to_string(UINT command) /****************************************************************** * HtmlHelpW (hhctrl.ocx.15) */ -HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD data) +HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR data) { - TRACE("(%p, %s, command=%s, data=%d)\n", + TRACE("(%p, %s, command=%s, data=%lx)\n", caller, debugstr_w( filename ), command_to_string( command ), data); @@ -139,22 +140,64 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD data) /****************************************************************** * HtmlHelpA (hhctrl.ocx.14) */ -HWND WINAPI HtmlHelpA(HWND caller, LPCSTR filename, UINT command, DWORD data) +HWND WINAPI HtmlHelpA(HWND caller, LPCSTR filename, UINT command, DWORD_PTR data) { - WCHAR *wfile = NULL; + WCHAR *wfile = NULL, *wdata = NULL; + DWORD len; HWND result; if (filename) { - DWORD len = MultiByteToWideChar( CP_ACP, 0, filename, -1, NULL, 0 ); - + len = MultiByteToWideChar( CP_ACP, 0, filename, -1, NULL, 0 ); wfile = hhctrl_alloc(len*sizeof(WCHAR)); MultiByteToWideChar( CP_ACP, 0, filename, -1, wfile, len ); } - result = HtmlHelpW( caller, wfile, command, data ); + if (data) + { + switch(command) + { + case HH_ALINK_LOOKUP: + case HH_DISPLAY_SEARCH: + case HH_DISPLAY_TEXT_POPUP: + case HH_GET_LAST_ERROR: + case HH_GET_WIN_TYPE: + case HH_KEYWORD_LOOKUP: + case HH_SET_WIN_TYPE: + case HH_SYNC: + FIXME("structures not handled yet\n"); + break; + + case HH_DISPLAY_INDEX: + case HH_DISPLAY_TOPIC: + case HH_DISPLAY_TOC: + case HH_GET_WIN_HANDLE: + case HH_SAFE_DISPLAY_TOPIC: + len = MultiByteToWideChar( CP_ACP, 0, (const char*)data, -1, NULL, 0 ); + wdata = hhctrl_alloc(len*sizeof(WCHAR)); + MultiByteToWideChar( CP_ACP, 0, (const char*)data, -1, wdata, len ); + break; + + case HH_CLOSE_ALL: + case HH_HELP_CONTEXT: + case HH_INITIALIZE: + case HH_PRETRANSLATEMESSAGE: + case HH_TP_HELP_CONTEXTMENU: + case HH_TP_HELP_WM_HELP: + case HH_UNINITIALIZE: + /* either scalar or pointer to scalar - do nothing */ + break; + + default: + FIXME("Unknown command: %s (%d)\n", command_to_string(command), command); + break; + } + } + + result = HtmlHelpW( caller, wfile, command, wdata ? (DWORD_PTR)wdata : data ); hhctrl_free(wfile); + hhctrl_free(wdata); return result; } diff --git a/include/htmlhelp.h b/include/htmlhelp.h index edfae94..bd7d708 100644 --- a/include/htmlhelp.h +++ b/include/htmlhelp.h @@ -48,6 +48,7 @@ #define HH_SET_EXCLUSIVE_FILTER 0x19 #define HH_INITIALIZE 0x1C #define HH_UNINITIALIZE 0x1D +#define HH_SAFE_DISPLAY_TOPIC 0x20 #define HH_PRETRANSLATEMESSAGE 0xFD #define HH_SET_GLOBAL_PROPERTY 0xFC @@ -419,8 +420,8 @@ typedef struct tagHH_NTRACKW { DECL_WINELIB_TYPE_AW(HH_NTRACK) -HWND WINAPI HtmlHelpA(HWND,LPCSTR,UINT,DWORD); -HWND WINAPI HtmlHelpW(HWND,LPCWSTR,UINT,DWORD); +HWND WINAPI HtmlHelpA(HWND,LPCSTR,UINT,DWORD_PTR); +HWND WINAPI HtmlHelpW(HWND,LPCWSTR,UINT,DWORD_PTR); #define HtmlHelp WINELIB_NAME_AW(HtmlHelp) #define ATOM_HTMLHELP_API_ANSI (LPTSTR)14

1 0

Stefan Dösinger : ddraw: Forward all 4 world matrices to wined3d.
by Alexandre Julliard May 3, 2007

May 3, 2007

Module: wine Branch: master Commit: 6acc0a151de888cc06d8c0b95710fe5e551fec3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6acc0a151de888cc06d8c0b95… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 25 16:44:47 2007 +0200 ddraw: Forward all 4 world matrices to wined3d. --- dlls/ddraw/device.c | 63 +++++++++++++++++++++------------------------------ 1 files changed, 26 insertions(+), 37 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 5ef8748..30f80ad 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2721,18 +2721,14 @@ IDirect3DDeviceImpl_7_SetTransform(IDirect3DDevice7 *iface, if(!Matrix) return DDERR_INVALIDPARAMS; - /* D3DTRANSFORMSTATE_WORLD doesn't exist in WineD3D, - * use D3DTS_WORLDMATRIX(0) instead - * D3DTS_WORLDMATRIX(index) is (D3DTRANSFORMSTATETYPE)(index + 256) - */ - if(TransformStateType == D3DTRANSFORMSTATE_WORLD) - type = (D3DTRANSFORMSTATETYPE)(0 + 256); - - /* FIXME: - Unhandled: D3DTRANSFORMSTATE_WORLD1 - Unhandled: D3DTRANSFORMSTATE_WORLD2 - Unhandled: D3DTRANSFORMSTATE_WORLD3 - */ + switch(TransformStateType) + { + case D3DTRANSFORMSTATE_WORLD : type = WINED3DTS_WORLDMATRIX(0); break; + case D3DTRANSFORMSTATE_WORLD1: type = WINED3DTS_WORLDMATRIX(1); break; + case D3DTRANSFORMSTATE_WORLD2: type = WINED3DTS_WORLDMATRIX(2); break; + case D3DTRANSFORMSTATE_WORLD3: type = WINED3DTS_WORLDMATRIX(3); break; + default: type = TransformStateType; + } /* Note: D3DMATRIX is compatible with WINED3DMATRIX */ return IWineD3DDevice_SetTransform(This->wineD3DDevice, @@ -2793,18 +2789,14 @@ IDirect3DDeviceImpl_7_GetTransform(IDirect3DDevice7 *iface, if(!Matrix) return DDERR_INVALIDPARAMS; - /* D3DTRANSFORMSTATE_WORLD doesn't exist in WineD3D, - * use D3DTS_WORLDMATRIX(0) instead - * D3DTS_WORLDMATRIX(index) is (D3DTRANSFORMSTATETYPE)(index + 256) - */ - if(TransformStateType == D3DTRANSFORMSTATE_WORLD) - type = (D3DTRANSFORMSTATETYPE)(0 + 256); - - /* FIXME: - Unhandled: D3DTRANSFORMSTATE_WORLD1 - Unhandled: D3DTRANSFORMSTATE_WORLD2 - Unhandled: D3DTRANSFORMSTATE_WORLD3 - */ + switch(TransformStateType) + { + case D3DTRANSFORMSTATE_WORLD : type = WINED3DTS_WORLDMATRIX(0); break; + case D3DTRANSFORMSTATE_WORLD1: type = WINED3DTS_WORLDMATRIX(1); break; + case D3DTRANSFORMSTATE_WORLD2: type = WINED3DTS_WORLDMATRIX(2); break; + case D3DTRANSFORMSTATE_WORLD3: type = WINED3DTS_WORLDMATRIX(3); break; + default: type = TransformStateType; + } /* Note: D3DMATRIX is compatible with WINED3DMATRIX */ return IWineD3DDevice_GetTransform(This->wineD3DDevice, type, (WINED3DMATRIX*) Matrix); @@ -2858,24 +2850,21 @@ IDirect3DDeviceImpl_7_MultiplyTransform(IDirect3DDevice7 *iface, D3DMATRIX *D3DMatrix) { ICOM_THIS_FROM(IDirect3DDeviceImpl, IDirect3DDevice7, iface); + D3DTRANSFORMSTATETYPE type; TRACE("(%p)->(%08x,%p): Relay\n", This, TransformStateType, D3DMatrix); - /* D3DTRANSFORMSTATE_WORLD doesn't exist in WineD3D, - * use D3DTS_WORLDMATRIX(0) instead - * D3DTS_WORLDMATRIX(index) is (D3DTRANSFORMSTATETYPE)(index + 256) - */ - if(TransformStateType == D3DTRANSFORMSTATE_WORLD) - TransformStateType = (D3DTRANSFORMSTATETYPE)(0 + 256); - - /* FIXME: - Unhandled: D3DTRANSFORMSTATE_WORLD1 - Unhandled: D3DTRANSFORMSTATE_WORLD2 - Unhandled: D3DTRANSFORMSTATE_WORLD3 - */ + switch(TransformStateType) + { + case D3DTRANSFORMSTATE_WORLD : type = WINED3DTS_WORLDMATRIX(0); break; + case D3DTRANSFORMSTATE_WORLD1: type = WINED3DTS_WORLDMATRIX(1); break; + case D3DTRANSFORMSTATE_WORLD2: type = WINED3DTS_WORLDMATRIX(2); break; + case D3DTRANSFORMSTATE_WORLD3: type = WINED3DTS_WORLDMATRIX(3); break; + default: type = TransformStateType; + } /* Note: D3DMATRIX is compatible with WINED3DMATRIX */ return IWineD3DDevice_MultiplyTransform(This->wineD3DDevice, - TransformStateType, + type, (WINED3DMATRIX*) D3DMatrix); }

1 0

Alexandre Julliard : widl: Don' t declare a global binding handle when using an implicit handle.
by Alexandre Julliard May 3, 2007

May 3, 2007

Module: wine Branch: master Commit: 7ca4e025e7b011489bf2a2b82e2d81aab81ba885 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ca4e025e7b011489bf2a2b82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 3 14:25:58 2007 +0200 widl: Don't declare a global binding handle when using an implicit handle. --- tools/widl/client.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index d9338c0..1652a3f 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -88,6 +88,9 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset, unsig const var_t *var; int method_count = 0; + if (!implicit_handle) + print_client("static RPC_BINDING_HANDLE %s__MIDL_AutoBindHandle;\n\n", iface->name); + if (iface->funcs) LIST_FOR_EACH_ENTRY( func, iface->funcs, const func_t, entry ) { const var_t *def = func->def; @@ -269,13 +272,6 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset, unsig } -static void write_bindinghandledecl(type_t *iface) -{ - print_client("static RPC_BINDING_HANDLE %s__MIDL_AutoBindHandle;\n", iface->name); - fprintf(client, "\n"); -} - - static void write_stubdescdecl(type_t *iface) { print_client("static const MIDL_STUB_DESC %s_StubDesc;\n", iface->name); @@ -433,8 +429,6 @@ void write_client(ifref_list_t *ifaces) write_clientinterfacedecl(iface->iface); write_stubdescdecl(iface->iface); - write_bindinghandledecl(iface->iface); - write_function_stubs(iface->iface, &proc_offset, &type_offset); print_client("#if !defined(__RPC_WIN32__)\n");

1 0

Mounir IDRASSI : advapi32: Check for error in CryptEnumProviderTypesA and CryptEnumProvidersA.
by Alexandre Julliard May 3, 2007

May 3, 2007

Module: wine Branch: master Commit: 5bb4ed2d66b43560858470ca5e64497169361fec URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bb4ed2d66b43560858470ca5… Author: Mounir IDRASSI <mounir.idrassi(a)idrix.fr> Date: Wed May 2 22:12:20 2007 +0200 advapi32: Check for error in CryptEnumProviderTypesA and CryptEnumProvidersA. --- dlls/advapi32/crypt.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 1fd16c3..a7273b9 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -1139,7 +1139,8 @@ BOOL WINAPI CryptEnumProvidersA (DWORD dwIndex, DWORD *pdwReserved, TRACE("(%d, %p, %08x, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags, pdwProvType, pszProvName, pcbProvName); - CryptEnumProvidersW(dwIndex, pdwReserved, dwFlags, pdwProvType, NULL, &strlen); + if(!CryptEnumProvidersW(dwIndex, pdwReserved, dwFlags, pdwProvType, NULL, &strlen)) + return FALSE; if ( pszProvName && !(str = CRYPT_Alloc(strlen)) ) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -1267,7 +1268,8 @@ BOOL WINAPI CryptEnumProviderTypesA (DWORD dwIndex, DWORD *pdwReserved, TRACE("(%d, %p, %08x, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags, pdwProvType, pszTypeName, pcbTypeName); - CryptEnumProviderTypesW(dwIndex, pdwReserved, dwFlags, pdwProvType, NULL, &strlen); + if(!CryptEnumProviderTypesW(dwIndex, pdwReserved, dwFlags, pdwProvType, NULL, &strlen)) + return FALSE; if ( pszTypeName && !(str = CRYPT_Alloc(strlen)) ) { SetLastError(ERROR_NOT_ENOUGH_MEMORY);

1 0

Mikołaj Zalewski : user32: Fix TabbedTextOut.
by Alexandre Julliard May 3, 2007

May 3, 2007

Module: wine Branch: master Commit: 521cba2bc7b9382580a41ac6b238196086205d73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=521cba2bc7b9382580a41ac6b… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed May 2 20:30:43 2007 +0200 user32: Fix TabbedTextOut. The TEXT_TabbedTextOut didn't set correctly the text starting point (x0) for left-aligned tabs and was ignoring the last tab. I've also changed GetTextMetricsA to W as this should be slightly faster. --- dlls/user32/text.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/user32/text.c b/dlls/user32/text.c index cd1cc75..ab099fc 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -1248,8 +1248,8 @@ static LONG TEXT_TabbedTextOut( HDC hdc, INT x, INT y, LPCWSTR lpstr, } else { - TEXTMETRICA tm; - GetTextMetricsA( hdc, &tm ); + TEXTMETRICW tm; + GetTextMetricsW( hdc, &tm ); defWidth = 8 * tm.tmAveCharWidth; } @@ -1270,12 +1270,13 @@ static LONG TEXT_TabbedTextOut( HDC hdc, INT x, INT y, LPCWSTR lpstr, /* and if there is a <tab>, calculate its position */ if( i) { /* get x coordinate for the drawing of this string */ - for (; cTabStops > i; lpTabPos++, cTabStops--) + for (; cTabStops >= i; lpTabPos++, cTabStops--) { if( nTabOrg + abs( *lpTabPos) > x) { if( lpTabPos[ i - 1] >= 0) { /* a left aligned tab */ - x = nTabOrg + lpTabPos[ i-1] + extent.cx; + x0 = nTabOrg + lpTabPos[i-1]; + x = x0 + extent.cx; break; } else @@ -1294,10 +1295,10 @@ static LONG TEXT_TabbedTextOut( HDC hdc, INT x, INT y, LPCWSTR lpstr, } /* if we have run out of tab stops and we have a valid default tab * stop width then round x up to that width */ - if ((cTabStops <= i) && (defWidth > 0)) { + if ((cTabStops < i) && (defWidth > 0)) { x0 = nTabOrg + ((x - nTabOrg) / defWidth + i) * defWidth; x = x0 + extent.cx; - } else if ((cTabStops <= i) && (defWidth < 0)) { + } else if ((cTabStops < i) && (defWidth < 0)) { x = nTabOrg + ((x - nTabOrg + extent.cx) / -defWidth + i) * -defWidth; x0 = x - extent.cx;

1 0

Stefan Dösinger : wined3d: Implement vertex blending using GL_ARB_vertex_blend.
by Alexandre Julliard May 3, 2007

May 3, 2007

Module: wine Branch: master Commit: adb9b13b81f6582fe84358f3c4ecbc1b4c4f0bf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adb9b13b81f6582fe84358f3c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 27 00:43:15 2007 +0200 wined3d: Implement vertex blending using GL_ARB_vertex_blend. --- dlls/wined3d/context.c | 8 +++ dlls/wined3d/directx.c | 8 +-- dlls/wined3d/drawprim.c | 4 +- dlls/wined3d/state.c | 137 +++++++++++++++++++++++++++++++--------- dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 119 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=adb9b13b81f6582fe8435…

1 0

Stefan Dösinger : d3d: Calculate the size of WINED3DFVF_XYZBx FVFs.
by Alexandre Julliard May 3, 2007

May 3, 2007

Module: wine Branch: master Commit: d913744f1eff5002b50be0cf1b20a2352c09d8ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=d913744f1eff5002b50be0cf1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 25 00:38:32 2007 +0200 d3d: Calculate the size of WINED3DFVF_XYZBx FVFs. --- dlls/ddraw/utils.c | 9 +++++++-- dlls/wined3d/utils.c | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 204342a..07b386c 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -894,9 +894,14 @@ get_flexible_vertex_size(DWORD d3dvtVertexType) if (d3dvtVertexType & D3DFVF_RESERVED1) size += sizeof(DWORD); switch (d3dvtVertexType & D3DFVF_POSITION_MASK) { - case D3DFVF_XYZ: size += 3 * sizeof(D3DVALUE); break; + case D3DFVF_XYZ: size += 3 * sizeof(D3DVALUE); break; case D3DFVF_XYZRHW: size += 4 * sizeof(D3DVALUE); break; - default: TRACE(" matrix weighting not handled yet...\n"); + case D3DFVF_XYZB1: size += 4 * sizeof(D3DVALUE); break; + case D3DFVF_XYZB2: size += 5 * sizeof(D3DVALUE); break; + case D3DFVF_XYZB3: size += 6 * sizeof(D3DVALUE); break; + case D3DFVF_XYZB4: size += 7 * sizeof(D3DVALUE); break; + case D3DFVF_XYZB5: size += 8 * sizeof(D3DVALUE); break; + default: ERR("Unexpected position mask\n"); } for (i = 0; i < GET_TEXCOUNT_FROM_FVF(d3dvtVertexType); i++) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b39f648..9ab4e76 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2488,9 +2488,14 @@ DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) { if (d3dvtVertexType & WINED3DFVF_SPECULAR) size += sizeof(DWORD); if (d3dvtVertexType & WINED3DFVF_PSIZE) size += sizeof(DWORD); switch (d3dvtVertexType & WINED3DFVF_POSITION_MASK) { - case WINED3DFVF_XYZ: size += 3 * sizeof(float); break; + case WINED3DFVF_XYZ: size += 3 * sizeof(float); break; case WINED3DFVF_XYZRHW: size += 4 * sizeof(float); break; - default: TRACE(" matrix weighting not handled yet...\n"); + case WINED3DFVF_XYZB1: size += 4 * sizeof(float); break; + case WINED3DFVF_XYZB2: size += 5 * sizeof(float); break; + case WINED3DFVF_XYZB3: size += 6 * sizeof(float); break; + case WINED3DFVF_XYZB4: size += 7 * sizeof(float); break; + case WINED3DFVF_XYZB5: size += 8 * sizeof(float); break; + default: ERR("Unexpected position mask\n"); } for (i = 0; i < numTextures; i++) { size += GET_TEXCOORD_SIZE_FROM_FVF(d3dvtVertexType, i) * sizeof(float);

1 0

Stefan Dösinger : wined3d: Add missing prototypes for GL_ARB_vertex_blend.
by Alexandre Julliard May 3, 2007

May 3, 2007

Module: wine Branch: master Commit: 34f95c683ec8210523575f5017fefae55ef35bb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34f95c683ec8210523575f501… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 24 23:30:22 2007 +0200 wined3d: Add missing prototypes for GL_ARB_vertex_blend. --- include/wine/wined3d_gl.h | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 7a2ffdb..c325539 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -283,6 +283,15 @@ typedef void (APIENTRY * PGLFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GL #define GL_MODELVIEW31_ARB 0x873F #endif typedef void (APIENTRY * PGLFNGLWEIGHTPOINTERARB) (GLint size, GLenum type, GLsizei stride, GLvoid* pointer); +typedef void (APIENTRY * PGLFNGLWEIGHTBV) (GLint size, const GLbyte *weights); +typedef void (APIENTRY * PGLFNGLWEIGHTSV) (GLint size, const GLshort *weights); +typedef void (APIENTRY * PGLFNGLWEIGHTIV) (GLint size, const GLint *weights); +typedef void (APIENTRY * PGLFNGLWEIGHTFV) (GLint size, const GLfloat *weights); +typedef void (APIENTRY * PGLFNGLWEIGHTDV) (GLint size, const GLdouble *weights); +typedef void (APIENTRY * PGLFNGLWEIGHTUBV) (GLint size, const GLubyte *weights); +typedef void (APIENTRY * PGLFNGLWEIGHTUSV) (GLint size, const GLushort *weights); +typedef void (APIENTRY * PGLFNGLWEIGHTUIV) (GLint size, const GLuint *weights); +typedef void (APIENTRY * PGLFNGLVERTEXBLENDARB) (GLint count); /* GL_ARB_pixel_buffer_object */ #ifndef GL_ARB_pixel_buffer_object #define GL_ARB_pixel_buffer_object 1 @@ -1595,6 +1604,15 @@ typedef enum _GL_SupportedExt { USE_GL_FUNC(PGLFNGETCOMPRESSEDTEXIMAGEPROC, glGetCompressedTexImageARB); \ /* GL_ARB_vertex_blend */ \ USE_GL_FUNC(PGLFNGLWEIGHTPOINTERARB, glWeightPointerARB); \ + USE_GL_FUNC(PGLFNGLWEIGHTBV, glWeightbvARB); \ + USE_GL_FUNC(PGLFNGLWEIGHTSV, glWeightsvARB); \ + USE_GL_FUNC(PGLFNGLWEIGHTIV, glWeightivARB); \ + USE_GL_FUNC(PGLFNGLWEIGHTFV, glWeightfvARB); \ + USE_GL_FUNC(PGLFNGLWEIGHTDV, glWeightdvARB); \ + USE_GL_FUNC(PGLFNGLWEIGHTUBV, glWeightubvARB); \ + USE_GL_FUNC(PGLFNGLWEIGHTUSV, glWeightusvARB); \ + USE_GL_FUNC(PGLFNGLWEIGHTUIV, glWeightuivARB); \ + USE_GL_FUNC(PGLFNGLVERTEXBLENDARB, glVertexBlendARB); \ /* GL_ARB_vertex_buffer_object */ \ USE_GL_FUNC(PGLFNBINDBUFFERARBPROC, glBindBufferARB); \ USE_GL_FUNC(PGLFNDELETEBUFFERSARBPROC, glDeleteBuffersARB); \

1 0