November 2005 - Wine-Commits

wine/ dlls/winmm/winmm_Ko.rc programs/wcmd/Ko. ...
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21460 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:01:35 Modified files: dlls/winmm : winmm_Ko.rc programs/wcmd : Ko.rc programs/winecfg: Ko.rc Log message: YunSong Hwang <hys545(a)dreamwiz.com> Update Korean translations. Patch: http://cvs.winehq.org/patch.py?id=21460 Old revision New revision Changes Path 1.1 1.2 +50 -50 wine/dlls/winmm/winmm_Ko.rc 1.3 1.4 +74 -79 wine/programs/wcmd/Ko.rc 1.3 1.4 +3 -4 wine/programs/winecfg/Ko.rc

1 0

wine/dlls/ole32 ole32res.rc
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21459 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:01:29 Modified files: dlls/ole32 : ole32res.rc Log message: Michael Jung <mjung(a)iss.tu-darmstadt.de> Correct the hot spot position of the drag&drop 'move' and 'link' cursors. Patch: http://cvs.winehq.org/patch.py?id=21459 Old revision New revision Changes Path 1.6 1.7 +2 -2 wine/dlls/ole32/ole32res.rc Index: wine/dlls/ole32/ole32res.rc diff -u -p wine/dlls/ole32/ole32res.rc:1.6 wine/dlls/ole32/ole32res.rc:1.7 --- wine/dlls/ole32/ole32res.rc:1.6 28 Nov 2005 11: 1:29 -0000 +++ wine/dlls/ole32/ole32res.rc 28 Nov 2005 11: 1:29 -0000 @@ -62,7 +62,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* BINRES drag_move.cur */ 1 CURSOR drag_move.cur /* { - '00 00 02 00 01 00 20 20 00 00 12 00 16 00 30 01' + '00 00 02 00 01 00 20 20 00 00 01 00 01 00 30 01' '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' '00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' @@ -114,7 +114,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* BINRES drag_link.cur */ 3 CURSOR drag_link.cur /* { - '00 00 02 00 01 00 20 20 00 00 12 00 16 00 30 01' + '00 00 02 00 01 00 20 20 00 00 01 00 01 00 30 01' '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' '00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'

1 0

wine/dlls/shdocvw webbrowser.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21458 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:01:25 Modified files: dlls/shdocvw : webbrowser.c Log message: Jacek Caban <jacek(a)codeweavers.com> Don't crash when parameters of Navigate2 are NULL. Patch: http://cvs.winehq.org/patch.py?id=21458 Old revision New revision Changes Path 1.25 1.26 +7 -3 wine/dlls/shdocvw/webbrowser.c Index: wine/dlls/shdocvw/webbrowser.c diff -u -p wine/dlls/shdocvw/webbrowser.c:1.25 wine/dlls/shdocvw/webbrowser.c:1.26 --- wine/dlls/shdocvw/webbrowser.c:1.25 28 Nov 2005 11: 1:25 -0000 +++ wine/dlls/shdocvw/webbrowser.c 28 Nov 2005 11: 1:25 -0000 @@ -504,12 +504,16 @@ static HRESULT WINAPI WebBrowser_Navigat if(!This->client) return E_FAIL; - if(V_VT(Flags) != VT_EMPTY || V_VT(TargetFrameName) != VT_EMPTY - || V_VT(PostData) != VT_EMPTY || V_VT(Headers) != VT_EMPTY) + if((Flags && V_VT(Flags) != VT_EMPTY) + || (TargetFrameName && V_VT(TargetFrameName) != VT_EMPTY) + || (PostData && V_VT(PostData) != VT_EMPTY) + || (Headers && V_VT(Headers) != VT_EMPTY)) FIXME("Unsupported arguments\n"); + if(!URL) + return S_OK; if(V_VT(URL) != VT_BSTR) - FIXME("V_VT(URL) != VT_BSTR\n"); + return E_INVALIDARG; /* * FIXME:

1 0

wine/dlls/wininet http.c internet.h
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21457 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:01:18 Modified files: dlls/wininet : http.c internet.h Log message: Robert Shearman <rob(a)codeweavers.com> Add a new field "lpszHostName" to the session to track the host name of the HTTP server, as opposed to the server that we will connect to that could be a proxy server. Fixes the "Host:" header that we send to servers. Patch: http://cvs.winehq.org/patch.py?id=21457 Old revision New revision Changes Path 1.114 1.115 +12 -5 wine/dlls/wininet/http.c 1.42 1.43 +2 -1 wine/dlls/wininet/internet.h Index: wine/dlls/wininet/http.c diff -u -p wine/dlls/wininet/http.c:1.114 wine/dlls/wininet/http.c:1.115 --- wine/dlls/wininet/http.c:1.114 28 Nov 2005 11: 1:18 -0000 +++ wine/dlls/wininet/http.c 28 Nov 2005 11: 1:18 -0000 @@ -933,15 +933,15 @@ static BOOL HTTP_DealWithProxy( LPWININE if( !lpwhr->lpszPath ) lpwhr->lpszPath = (LPWSTR)szNul; TRACE("server='%s' path='%s'\n", - debugstr_w(lpwhs->lpszServerName), debugstr_w(lpwhr->lpszPath)); + debugstr_w(lpwhs->lpszHostName), debugstr_w(lpwhr->lpszPath)); /* for constant 15 see above */ - len = strlenW(lpwhs->lpszServerName) + strlenW(lpwhr->lpszPath) + 15; + len = strlenW(lpwhs->lpszHostName) + strlenW(lpwhr->lpszPath) + 15; url = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); if(UrlComponents.nPort == INTERNET_INVALID_PORT_NUMBER) UrlComponents.nPort = INTERNET_DEFAULT_HTTP_PORT; - sprintfW(url, szFormat2, lpwhs->lpszServerName, lpwhs->nServerPort); + sprintfW(url, szFormat2, lpwhs->lpszHostName, lpwhs->nServerPort); if( lpwhr->lpszPath[0] != '/' ) strcatW( url, szSlash ); @@ -949,7 +949,8 @@ static BOOL HTTP_DealWithProxy( LPWININE if(lpwhr->lpszPath != szNul) HeapFree(GetProcessHeap(), 0, lpwhr->lpszPath); lpwhr->lpszPath = url; - /* FIXME: Do I have to free lpwhs->lpszServerName here ? */ + + HeapFree(GetProcessHeap(), 0, lpwhs->lpszServerName); lpwhs->lpszServerName = WININET_strdupW(UrlComponents.lpszHostName); lpwhs->nServerPort = UrlComponents.nPort; @@ -1058,7 +1059,7 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(L HTTP_ProcessHeader(lpwhr, g_szHost, UrlComponents.lpszHostName, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); } else - HTTP_ProcessHeader(lpwhr, g_szHost, lpwhs->lpszServerName, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); + HTTP_ProcessHeader(lpwhr, g_szHost, lpwhs->lpszHostName, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); if (lpwhs->nServerPort == INTERNET_INVALID_PORT_NUMBER) lpwhs->nServerPort = (dwFlags & INTERNET_FLAG_SECURE ? @@ -1843,6 +1844,8 @@ static BOOL HTTP_HandleRedirect(LPWININE HTTP_ADDHDR_FLAG_ADD_IF_NEW); #endif + HeapFree(GetProcessHeap(), 0, lpwhs->lpszHostName); + lpwhs->lpszHostName = WININET_strdupW(hostName); HeapFree(GetProcessHeap(), 0, lpwhs->lpszServerName); lpwhs->lpszServerName = WININET_strdupW(hostName); HeapFree(GetProcessHeap(), 0, lpwhs->lpszUserName); @@ -2125,7 +2128,10 @@ HINTERNET HTTP_Connect(LPWININETAPPINFOW FIXME("Proxy bypass is ignored.\n"); } if (NULL != lpszServerName) + { lpwhs->lpszServerName = WININET_strdupW(lpszServerName); + lpwhs->lpszHostName = WININET_strdupW(lpszServerName); + } if (NULL != lpszUserName) lpwhs->lpszUserName = WININET_strdupW(lpszUserName); lpwhs->nServerPort = nServerPort; @@ -2843,6 +2849,7 @@ static void HTTP_CloseHTTPSessionHandle( TRACE("%p\n", lpwhs); + HeapFree(GetProcessHeap(), 0, lpwhs->lpszHostName); HeapFree(GetProcessHeap(), 0, lpwhs->lpszServerName); HeapFree(GetProcessHeap(), 0, lpwhs->lpszUserName); HeapFree(GetProcessHeap(), 0, lpwhs); Index: wine/dlls/wininet/internet.h diff -u -p wine/dlls/wininet/internet.h:1.42 wine/dlls/wininet/internet.h:1.43 --- wine/dlls/wininet/internet.h:1.42 28 Nov 2005 11: 1:18 -0000 +++ wine/dlls/wininet/internet.h 28 Nov 2005 11: 1:18 -0000 @@ -164,7 +164,8 @@ typedef struct typedef struct { WININETHANDLEHEADER hdr; - LPWSTR lpszServerName; + LPWSTR lpszHostName; /* the final destination of the request */ + LPWSTR lpszServerName; /* the name of the server we directly connect to */ LPWSTR lpszUserName; INTERNET_PORT nServerPort; struct sockaddr_in socketAddress;

1 0

wine/dlls/winmm winmm.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21456 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:01:05 Modified files: dlls/winmm : winmm.c Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> LoadLibrary16 is no longer exported by name, so do the lookup by its ordinal (when loading NE sibling). Patch: http://cvs.winehq.org/patch.py?id=21456 Old revision New revision Changes Path 1.57 1.58 +1 -1 wine/dlls/winmm/winmm.c Index: wine/dlls/winmm/winmm.c diff -u -p wine/dlls/winmm/winmm.c:1.57 wine/dlls/winmm/winmm.c:1.58 --- wine/dlls/winmm/winmm.c:1.57 28 Nov 2005 11: 1: 5 -0000 +++ wine/dlls/winmm/winmm.c 28 Nov 2005 11: 1: 5 -0000 @@ -116,7 +116,7 @@ BOOL WINMM_CheckForMMSystem(void) if (h) { pGetModuleHandle16 = (void*)GetProcAddress(h, "GetModuleHandle16"); - pLoadLibrary16 = (void*)GetProcAddress(h, "LoadLibrary16"); + pLoadLibrary16 = (void*)GetProcAddress(h, (LPCSTR)35); /* ordinal for LoadLibrary16 */ if (pGetModuleHandle16 && pLoadLibrary16 && (pGetModuleHandle16("MMSYSTEM.DLL") || pLoadLibrary16("MMSYSTEM.DLL"))) loaded = 1;

1 0

wine/dlls/ntdll cdrom.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21455 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:00:54 Modified files: dlls/ntdll : cdrom.c Log message: Vitaliy Margolen <wine-patch(a)kievinfo.com> Handle IOCTL_DISK_CHECK_VERIFY which is synonym for IOCTL_STORAGE_CHECK_VERIFY. Patch: http://cvs.winehq.org/patch.py?id=21455 Old revision New revision Changes Path 1.72 1.73 +2 -0 wine/dlls/ntdll/cdrom.c Index: wine/dlls/ntdll/cdrom.c diff -u -p wine/dlls/ntdll/cdrom.c:1.72 wine/dlls/ntdll/cdrom.c:1.73 --- wine/dlls/ntdll/cdrom.c:1.72 28 Nov 2005 11: 0:54 -0000 +++ wine/dlls/ntdll/cdrom.c 28 Nov 2005 11: 0:54 -0000 @@ -1031,6 +1031,7 @@ static NTSTATUS CDROM_ReadQChannel(int d * CDROM_Verify * Implements: IOCTL_STORAGE_CHECK_VERIFY * IOCTL_CDROM_CHECK_VERIFY + * IOCTL_DISK_CHECK_VERIFY * */ static NTSTATUS CDROM_Verify(int dev, int fd) @@ -2032,6 +2033,7 @@ NTSTATUS CDROM_DeviceIoControl(HANDLE hD { case IOCTL_STORAGE_CHECK_VERIFY: case IOCTL_CDROM_CHECK_VERIFY: + case IOCTL_DISK_CHECK_VERIFY: sz = 0; CDROM_ClearCacheEntry(dev); if (lpInBuffer != NULL || nInBufferSize != 0 || lpOutBuffer != NULL || nOutBufferSize != 0)

1 0

wine/ dlls/dbghelp/dbghelp.spec dlls/dbghelp/s ...
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21454 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:00:44 Modified files: dlls/dbghelp : dbghelp.spec stack.c include : dbghelp.h Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> Added stubs for DbgHelp functions: SymRegisterFunctionEntryCallback. Patch: http://cvs.winehq.org/patch.py?id=21454 Old revision New revision Changes Path 1.11 1.12 +2 -2 wine/dlls/dbghelp/dbghelp.spec 1.9 1.10 +28 -0 wine/dlls/dbghelp/stack.c 1.16 1.17 +6 -0 wine/include/dbghelp.h Index: wine/dlls/dbghelp/dbghelp.spec diff -u -p wine/dlls/dbghelp/dbghelp.spec:1.11 wine/dlls/dbghelp/dbghelp.spec:1.12 --- wine/dlls/dbghelp/dbghelp.spec:1.11 28 Nov 2005 11: 0:44 -0000 +++ wine/dlls/dbghelp/dbghelp.spec 28 Nov 2005 11: 0:44 -0000 @@ -77,8 +77,8 @@ @ stub SymMatchString @ stub SymRegisterCallback64 @ stdcall SymRegisterCallback(long ptr ptr) -@ stub SymRegisterFunctionEntryCallback64 -@ stub SymRegisterFunctionEntryCallback +@ stdcall SymRegisterFunctionEntryCallback64(ptr ptr double) +@ stdcall SymRegisterFunctionEntryCallback(ptr ptr ptr) @ stdcall SymSetContext(long ptr ptr) @ stdcall SymSetOptions(long) @ stdcall SymSetParentWindow(long) Index: wine/dlls/dbghelp/stack.c diff -u -p wine/dlls/dbghelp/stack.c:1.9 wine/dlls/dbghelp/stack.c:1.10 --- wine/dlls/dbghelp/stack.c:1.9 28 Nov 2005 11: 0:44 -0000 +++ wine/dlls/dbghelp/stack.c 28 Nov 2005 11: 0:44 -0000 @@ -399,3 +399,31 @@ done_err: curr_mode = stm_done; return FALSE; } + +/****************************************************************** + * SymRegisterFunctionEntryCallback (DBGHELP.@) + * + * + */ +BOOL WINAPI SymRegisterFunctionEntryCallback(HANDLE hProc, + PSYMBOL_FUNCENTRY_CALLBACK cb, PVOID user) +{ + FIXME("(%p %p %p): stub!\n", hProc, cb, user); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/****************************************************************** + * SymRegisterFunctionEntryCallback64 (DBGHELP.@) + * + * + */ +BOOL WINAPI SymRegisterFunctionEntryCallback64(HANDLE hProc, + PSYMBOL_FUNCENTRY_CALLBACK64 cb, + ULONG64 user) +{ + FIXME("(%p %p %s): stub!\n", hProc, cb, wine_dbgstr_longlong(user)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + Index: wine/include/dbghelp.h diff -u -p wine/include/dbghelp.h:1.16 wine/include/dbghelp.h:1.17 --- wine/include/dbghelp.h:1.16 28 Nov 2005 11: 0:45 -0000 +++ wine/include/dbghelp.h 28 Nov 2005 11: 0:45 -0000 @@ -842,6 +842,12 @@ BOOL WINAPI StackWalk(DWORD, HANDLE, HAN PVOID WINAPI SymFunctionTableAccess(HANDLE, DWORD); +typedef PVOID (CALLBACK *PSYMBOL_FUNCENTRY_CALLBACK)(HANDLE, DWORD, PVOID); +typedef PVOID (CALLBACK *PSYMBOL_FUNCENTRY_CALLBACK64)(HANDLE, ULONG64, ULONG64); + +BOOL WINAPI SymRegisterFunctionEntryCallback(HANDLE, PSYMBOL_FUNCENTRY_CALLBACK, PVOID); +BOOL WINAPI SymRegisterFunctionEntryCallback64(HANDLE, PSYMBOL_FUNCENTRY_CALLBACK64, ULONG64); + /************************* * Version, global stuff * *************************/

1 0

wine/dlls/wined3d pixelshader.c vertexshader.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21453 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:00:37 Modified files: dlls/wined3d : pixelshader.c vertexshader.c Log message: Oliver Stieber <oliver_stieber(a)yahoo.co.uk> Correct the matrix sizes in software shaders and remove an erroneous parameter from lrp. Patch: http://cvs.winehq.org/patch.py?id=21453 Old revision New revision Changes Path 1.4 1.5 +8 -8 wine/dlls/wined3d/pixelshader.c 1.18 1.19 +8 -8 wine/dlls/wined3d/vertexshader.c Index: wine/dlls/wined3d/pixelshader.c diff -u -p wine/dlls/wined3d/pixelshader.c:1.4 wine/dlls/wined3d/pixelshader.c:1.5 --- wine/dlls/wined3d/pixelshader.c:1.4 28 Nov 2005 11: 0:37 -0000 +++ wine/dlls/wined3d/pixelshader.c 28 Nov 2005 11: 0:37 -0000 @@ -325,9 +325,9 @@ void pshader_frc(WINED3DSHADERVECTOR* d, typedef FLOAT D3DMATRIX44[4][4]; typedef FLOAT D3DMATRIX43[4][3]; -typedef FLOAT D3DMATRIX34[4][4]; -typedef FLOAT D3DMATRIX33[4][3]; -typedef FLOAT D3DMATRIX32[4][2]; +typedef FLOAT D3DMATRIX34[3][4]; +typedef FLOAT D3DMATRIX33[3][3]; +typedef FLOAT D3DMATRIX23[2][3]; void pshader_m4x4(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, /*WINED3DSHADERVECTOR* mat1*/ D3DMATRIX44 mat) { /* @@ -350,7 +350,7 @@ void pshader_m4x4(WINED3DSHADERVECTOR* d PSTRACE(("executing m4x4(4): mat=(%f, %f, %f, %f) (%f) (%f) \n", mat[3][0], mat[3][1], mat[3][2], mat[3][3], s0->w, d->w)); } -void pshader_m4x3(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, D3DMATRIX43 mat) { +void pshader_m4x3(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, D3DMATRIX34 mat) { d->x = mat[0][0] * s0->x + mat[0][1] * s0->y + mat[0][2] * s0->z + mat[0][3] * s0->w; d->y = mat[1][0] * s0->x + mat[1][1] * s0->y + mat[1][2] * s0->z + mat[1][3] * s0->w; d->z = mat[2][0] * s0->x + mat[2][1] * s0->y + mat[2][2] * s0->z + mat[2][3] * s0->w; @@ -361,7 +361,7 @@ void pshader_m4x3(WINED3DSHADERVECTOR* d PSTRACE(("executing m4x3(4): (%f) (%f) \n", s0->w, d->w)); } -void pshader_m3x4(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, D3DMATRIX34 mat) { +void pshader_m3x4(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, D3DMATRIX43 mat) { d->x = mat[0][0] * s0->x + mat[0][1] * s0->y + mat[0][2] * s0->z; d->y = mat[2][0] * s0->x + mat[1][1] * s0->y + mat[1][2] * s0->z; d->z = mat[2][0] * s0->x + mat[2][1] * s0->y + mat[2][2] * s0->z; @@ -383,7 +383,7 @@ void pshader_m3x3(WINED3DSHADERVECTOR* d PSTRACE(("executing m3x3(4): (%f) \n", d->w)); } -void pshader_m3x2(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, D3DMATRIX32 mat) { +void pshader_m3x2(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, D3DMATRIX23 mat) { FIXME("check\n"); d->x = mat[0][0] * s0->x + mat[0][1] * s0->y + mat[0][2] * s0->z; d->y = mat[1][0] * s0->x + mat[1][1] * s0->y + mat[1][2] * s0->z; @@ -394,11 +394,11 @@ void pshader_m3x2(WINED3DSHADERVECTOR* d /** * Version 2.0 specific */ -void pshader_lrp(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, WINED3DSHADERVECTOR* s1, WINED3DSHADERVECTOR* s2, WINED3DSHADERVECTOR* s3) { +void pshader_lrp(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, WINED3DSHADERVECTOR* s1, WINED3DSHADERVECTOR* s2) { d->x = s0->x * (s1->x - s2->x) + s2->x; d->y = s0->y * (s1->y - s2->y) + s2->y; d->z = s0->z * (s1->z - s2->z) + s2->z; - d->w = s0->w * (s1->w - s2->w) + s2->x; + d->w = s0->w * (s1->w - s2->w) + s2->w; } void pshader_crs(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, WINED3DSHADERVECTOR* s1) { Index: wine/dlls/wined3d/vertexshader.c diff -u -p wine/dlls/wined3d/vertexshader.c:1.18 wine/dlls/wined3d/vertexshader.c:1.19 --- wine/dlls/wined3d/vertexshader.c:1.18 28 Nov 2005 11: 0:37 -0000 +++ wine/dlls/wined3d/vertexshader.c 28 Nov 2005 11: 0:37 -0000 @@ -277,9 +277,9 @@ void vshader_frc(WINED3DSHADERVECTOR* d, typedef FLOAT D3DMATRIX44[4][4]; typedef FLOAT D3DMATRIX43[4][3]; -typedef FLOAT D3DMATRIX34[4][4]; -typedef FLOAT D3DMATRIX33[4][3]; -typedef FLOAT D3DMATRIX32[4][2]; +typedef FLOAT D3DMATRIX34[3][4]; +typedef FLOAT D3DMATRIX33[3][3]; +typedef FLOAT D3DMATRIX23[2][3]; void vshader_m4x4(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, /*WINED3DSHADERVECTOR* mat1*/ D3DMATRIX44 mat) { /* @@ -302,7 +302,7 @@ void vshader_m4x4(WINED3DSHADERVECTOR* d VSTRACE(("executing m4x4(4): mat=(%f, %f, %f, %f) (%f) (%f) \n", mat[3][0], mat[3][1], mat[3][2], mat[3][3], s0->w, d->w)); } -void vshader_m4x3(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, D3DMATRIX43 mat) { +void vshader_m4x3(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, D3DMATRIX34 mat) { d->x = mat[0][0] * s0->x + mat[0][1] * s0->y + mat[0][2] * s0->z + mat[0][3] * s0->w; d->y = mat[1][0] * s0->x + mat[1][1] * s0->y + mat[1][2] * s0->z + mat[1][3] * s0->w; d->z = mat[2][0] * s0->x + mat[2][1] * s0->y + mat[2][2] * s0->z + mat[2][3] * s0->w; @@ -313,7 +313,7 @@ void vshader_m4x3(WINED3DSHADERVECTOR* d VSTRACE(("executing m4x3(4): (%f) (%f) \n", s0->w, d->w)); } -void vshader_m3x4(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, D3DMATRIX34 mat) { +void vshader_m3x4(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, D3DMATRIX43 mat) { d->x = mat[0][0] * s0->x + mat[0][1] * s0->y + mat[0][2] * s0->z; d->y = mat[2][0] * s0->x + mat[1][1] * s0->y + mat[1][2] * s0->z; d->z = mat[2][0] * s0->x + mat[2][1] * s0->y + mat[2][2] * s0->z; @@ -335,7 +335,7 @@ void vshader_m3x3(WINED3DSHADERVECTOR* d VSTRACE(("executing m3x3(4): (%f) \n", d->w)); } -void vshader_m3x2(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, D3DMATRIX32 mat) { +void vshader_m3x2(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, D3DMATRIX23 mat) { FIXME("check\n"); d->x = mat[0][0] * s0->x + mat[0][1] * s0->y + mat[0][2] * s0->z; d->y = mat[1][0] * s0->x + mat[1][1] * s0->y + mat[1][2] * s0->z; @@ -346,11 +346,11 @@ void vshader_m3x2(WINED3DSHADERVECTOR* d /** * Version 2.0 specific */ -void vshader_lrp(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, WINED3DSHADERVECTOR* s1, WINED3DSHADERVECTOR* s2, WINED3DSHADERVECTOR* s3) { +void vshader_lrp(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, WINED3DSHADERVECTOR* s1, WINED3DSHADERVECTOR* s2) { d->x = s0->x * (s1->x - s2->x) + s2->x; d->y = s0->y * (s1->y - s2->y) + s2->y; d->z = s0->z * (s1->z - s2->z) + s2->z; - d->w = s0->w * (s1->w - s2->w) + s2->x; + d->w = s0->w * (s1->w - s2->w) + s2->w; } void vshader_crs(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, WINED3DSHADERVECTOR* s1) {

1 0

wine/dlls/x11drv settings.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21452 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:00:20 Modified files: dlls/x11drv : settings.c Log message: Lionel Ulmer <lionel.ulmer(a)free.fr> Ignore frequency requests in Desktop mode. Patch: http://cvs.winehq.org/patch.py?id=21452 Old revision New revision Changes Path 1.4 1.5 +1 -1 wine/dlls/x11drv/settings.c Index: wine/dlls/x11drv/settings.c diff -u -p wine/dlls/x11drv/settings.c:1.4 wine/dlls/x11drv/settings.c:1.5 --- wine/dlls/x11drv/settings.c:1.4 28 Nov 2005 11: 0:20 -0000 +++ wine/dlls/x11drv/settings.c 28 Nov 2005 11: 0:20 -0000 @@ -277,7 +277,7 @@ LONG X11DRV_ChangeDisplaySettingsEx( LPC if (devmode->dmPelsHeight != dd_modes[i].dwHeight) continue; } - if (devmode->dmFields & DM_DISPLAYFREQUENCY) + if ((devmode->dmFields & DM_DISPLAYFREQUENCY) && (dd_modes[i].wRefreshRate != 0)) { if (devmode->dmDisplayFrequency != dd_modes[i].wRefreshRate) continue;

1 0

wine/dlls/ole32 defaulthandler.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21451 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:00:16 Modified files: dlls/ole32 : defaulthandler.c Log message: Robert Shearman <rob(a)codeweavers.com> Call the equivalent delegate function for all of the simple functions. Patch: http://cvs.winehq.org/patch.py?id=21451 Old revision New revision Changes Path 1.35 1.36 +44 -2 wine/dlls/ole32/defaulthandler.c Index: wine/dlls/ole32/defaulthandler.c diff -u -p wine/dlls/ole32/defaulthandler.c:1.35 wine/dlls/ole32/defaulthandler.c:1.36 --- wine/dlls/ole32/defaulthandler.c:1.35 28 Nov 2005 11: 0:16 -0000 +++ wine/dlls/ole32/defaulthandler.c 28 Nov 2005 11: 0:16 -0000 @@ -307,9 +307,13 @@ static HRESULT WINAPI DefaultHandler_Set IOleClientSite* pClientSite) { DefaultHandler *This = impl_from_IOleObject(iface); + HRESULT hr = S_OK; TRACE("(%p, %p)\n", iface, pClientSite); + if (This->pOleDelegate) + hr = IOleObject_SetClientSite(This->pOleDelegate, pClientSite); + /* * Make sure we release the previous client site if there * was one. @@ -371,6 +375,9 @@ static HRESULT WINAPI DefaultHandler_Set debugstr_w(szContainerApp), debugstr_w(szContainerObj)); + if (This->pOleDelegate) + IOleObject_SetHostNames(This->pOleDelegate, szContainerApp, szContainerObj); + /* Be sure to cleanup before re-assinging the strings. */ HeapFree( GetProcessHeap(), 0, This->containerApp ); This->containerApp = NULL; @@ -452,11 +459,16 @@ static HRESULT WINAPI DefaultHandler_Set DWORD dwWhichMoniker, IMoniker* pmk) { + DefaultHandler *This = impl_from_IOleObject(iface); + TRACE("(%p, %ld, %p)\n", iface, dwWhichMoniker, pmk); + if (This->pOleDelegate) + return IOleObject_SetMoniker(This->pOleDelegate, dwWhichMoniker, pmk); + return S_OK; } @@ -478,6 +490,11 @@ static HRESULT WINAPI DefaultHandler_Get TRACE("(%p, %ld, %ld, %p)\n", iface, dwAssign, dwWhichMoniker, ppmk); + if (This->pOleDelegate) + return IOleObject_GetMoniker(This->pOleDelegate, dwAssign, dwWhichMoniker, + ppmk); + + /* FIXME: dwWhichMoniker == OLEWHICHMK_CONTAINER only? */ if (This->clientSite) { return IOleClientSite_GetMoniker(This->clientSite, @@ -503,9 +520,14 @@ static HRESULT WINAPI DefaultHandler_Ini BOOL fCreation, DWORD dwReserved) { + DefaultHandler *This = impl_from_IOleObject(iface); + TRACE("(%p, %p, %d, %ld)\n", iface, pDataObject, fCreation, dwReserved); + if (This->pOleDelegate) + return IOleObject_InitFromData(This->pOleDelegate, pDataObject, fCreation, + dwReserved); return OLE_E_NOTRUNNING; } @@ -521,9 +543,15 @@ static HRESULT WINAPI DefaultHandler_Get DWORD dwReserved, IDataObject** ppDataObject) { + DefaultHandler *This = impl_from_IOleObject(iface); + TRACE("(%p, %ld, %p)\n", iface, dwReserved, ppDataObject); + if (This->pOleDelegate) + return IOleObject_GetClipboardData(This->pOleDelegate, dwReserved, + ppDataObject); + return OLE_E_NOTRUNNING; } @@ -650,8 +678,14 @@ static HRESULT WINAPI DefaultHandler_Set DWORD dwDrawAspect, SIZEL* psizel) { + DefaultHandler *This = impl_from_IOleObject(iface); + TRACE("(%p, %lx, (%ld x %ld))\n", iface, dwDrawAspect, psizel->cx, psizel->cy); + + if (This->pOleDelegate) + IOleObject_SetExtent(This->pOleDelegate, dwDrawAspect, psizel); + return OLE_E_NOTRUNNING; } @@ -676,8 +710,10 @@ static HRESULT WINAPI DefaultHandler_Get TRACE("(%p, %lx, %p)\n", iface, dwDrawAspect, psizel); - hres = IUnknown_QueryInterface(This->dataCache, &IID_IViewObject2, (void**)&cacheView); + if (This->pOleDelegate) + return IOleObject_GetExtent(This->pOleDelegate, dwDrawAspect, psizel); + hres = IUnknown_QueryInterface(This->dataCache, &IID_IViewObject2, (void**)&cacheView); if (FAILED(hres)) return E_UNEXPECTED; @@ -824,7 +860,7 @@ static HRESULT WINAPI DefaultHandler_Get } /************************************************************************ - * DefaultHandler_SetExtent (IOleObject) + * DefaultHandler_SetColorScheme (IOleObject) * * This method is meaningless if the server is not running * @@ -834,7 +870,13 @@ static HRESULT WINAPI DefaultHandler_Set IOleObject* iface, struct tagLOGPALETTE* pLogpal) { + DefaultHandler *This = impl_from_IOleObject(iface); + TRACE("(%p, %p))\n", iface, pLogpal); + + if (This->pOleDelegate) + return IOleObject_SetColorScheme(This->pOleDelegate, pLogpal); + return OLE_E_NOTRUNNING; }

1 0