November 2005 - Wine-Commits

wine/dlls/crypt32 cert.c crypt32.spec
by Alexandre Julliard Nov. 30, 2005

Nov. 30, 2005

ChangeSet ID: 21570 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/30 06:04:12 Modified files: dlls/crypt32 : cert.c crypt32.spec Log message: Stefan Leichter <Stefan.Leichter(a)camLine.com> Added stub for CryptVerifyMessageSignature. Patch: http://cvs.winehq.org/patch.py?id=21570 Old revision New revision Changes Path 1.23 1.24 +10 -0 wine/dlls/crypt32/cert.c 1.33 1.34 +1 -1 wine/dlls/crypt32/crypt32.spec Index: wine/dlls/crypt32/cert.c diff -u -p wine/dlls/crypt32/cert.c:1.23 wine/dlls/crypt32/cert.c:1.24 --- wine/dlls/crypt32/cert.c:1.23 30 Nov 2005 12: 4:12 -0000 +++ wine/dlls/crypt32/cert.c 30 Nov 2005 12: 4:12 -0000 @@ -3297,3 +3297,13 @@ BOOL WINAPI CryptUnregisterDefaultOIDFun FIXME("stub: %lx %s %s\n", dwEncodingType, debugstr_a(pszFuncName), debugstr_w(pwszDll)); return FALSE; } + +BOOL WINAPI CryptVerifyMessageSignature(/*PCRYPT_VERIFY_MESSAGE_PARA*/ void* pVerifyPara, + DWORD dwSignerIndex, const BYTE* pbSignedBlob, DWORD cbSignedBlob, + BYTE* pbDecoded, DWORD* pcbDecoded, PCCERT_CONTEXT* ppSignerCert) +{ + FIXME("stub: %p, %ld, %p, %ld, %p, %p, %p\n", + pVerifyPara, dwSignerIndex, pbSignedBlob, cbSignedBlob, + pbDecoded, pcbDecoded, ppSignerCert); + return FALSE; +} Index: wine/dlls/crypt32/crypt32.spec diff -u -p wine/dlls/crypt32/crypt32.spec:1.33 wine/dlls/crypt32/crypt32.spec:1.34 --- wine/dlls/crypt32/crypt32.spec:1.33 30 Nov 2005 12: 4:12 -0000 +++ wine/dlls/crypt32/crypt32.spec 30 Nov 2005 12: 4:12 -0000 @@ -162,7 +162,7 @@ @ stub CryptVerifyDetachedMessageHash @ stub CryptVerifyDetachedMessageSignature @ stub CryptVerifyMessageHash -@ stub CryptVerifyMessageSignature +@ stdcall CryptVerifyMessageSignature(ptr long ptr long ptr ptr ptr) @ stub CryptVerifyMessageSignatureWithKey @ stub CryptVerifySignatureU @ stdcall I_CryptAllocTls()

1 0

wine/dlls user/tests/msg.c x11drv/winpos.c
by Alexandre Julliard Nov. 30, 2005

Nov. 30, 2005

ChangeSet ID: 21569 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/30 06:03:55 Modified files: dlls/user/tests: msg.c dlls/x11drv : winpos.c Log message: Vitaliy Margolen <wine-patch(a)kievinfo.com> ShowWindows(SW_SHOWMAXIMIZED) should ignore WS_MAXIMIZE window state. Change tests accordingly. Patch: http://cvs.winehq.org/patch.py?id=21569 Old revision New revision Changes Path 1.106 1.107 +3 -3 wine/dlls/user/tests/msg.c 1.142 1.143 +1 -3 wine/dlls/x11drv/winpos.c Index: wine/dlls/user/tests/msg.c diff -u -p wine/dlls/user/tests/msg.c:1.106 wine/dlls/user/tests/msg.c:1.107 --- wine/dlls/user/tests/msg.c:1.106 30 Nov 2005 12: 3:55 -0000 +++ wine/dlls/user/tests/msg.c 30 Nov 2005 12: 3:55 -0000 @@ -3081,11 +3081,11 @@ static void test_showwindow(void) trace("calling ShowWindow( SW_SHOWMAXIMIZE ) for invisible popup window\n"); ShowWindow(hwnd, SW_SHOWMAXIMIZED); - ok_sequence(WmShowMaxPopupResizedSeq, "ShowWindow(SW_SHOWMAXIMIZED):popup", TRUE); + ok_sequence(WmShowMaxPopupResizedSeq, "ShowWindow(SW_SHOWMAXIMIZED):popup", FALSE); trace("done\n"); GetWindowRect(hwnd, &rc); - todo_wine ok( rc.right-rc.left == GetSystemMetrics(SM_CXSCREEN) && + ok( rc.right-rc.left == GetSystemMetrics(SM_CXSCREEN) && rc.bottom-rc.top == GetSystemMetrics(SM_CYSCREEN), "Invalid maximized size after ShowWindow (%ld,%ld)-(%ld,%ld)\n", rc.left, rc.top, rc.right, rc.bottom); @@ -3105,7 +3105,7 @@ static void test_showwindow(void) trace("calling ShowWindow( SW_SHOWMAXIMIZE ) for invisible popup window\n"); ShowWindow(hwnd, SW_SHOWMAXIMIZED); - ok_sequence(WmShowMaxPopupSeq, "ShowWindow(SW_SHOWMAXIMIZED):popup", TRUE); + ok_sequence(WmShowMaxPopupSeq, "ShowWindow(SW_SHOWMAXIMIZED):popup", FALSE); trace("done\n"); DestroyWindow(hwnd); flush_sequence(); Index: wine/dlls/x11drv/winpos.c diff -u -p wine/dlls/x11drv/winpos.c:1.142 wine/dlls/x11drv/winpos.c:1.143 --- wine/dlls/x11drv/winpos.c:1.142 30 Nov 2005 12: 3:55 -0000 +++ wine/dlls/x11drv/winpos.c 30 Nov 2005 12: 3:55 -0000 @@ -966,9 +966,7 @@ BOOL X11DRV_ShowWindow( HWND hwnd, INT c case SW_SHOWMAXIMIZED: /* same as SW_MAXIMIZE */ swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED; - if( !(style & WS_MAXIMIZE) ) - swp |= WINPOS_MinMaximize( hwnd, SW_MAXIMIZE, &newPos ); - else swp |= SWP_NOSIZE | SWP_NOMOVE; + swp |= WINPOS_MinMaximize( hwnd, SW_MAXIMIZE, &newPos ); break; case SW_SHOWNA:

1 0

wine/dlls/user tests/msg.c win.c
by Alexandre Julliard Nov. 30, 2005

Nov. 30, 2005

ChangeSet ID: 21568 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/30 06:03:16 Modified files: dlls/user/tests: msg.c dlls/user : win.c Log message: Vitaliy Margolen <wine-patch(a)kievinfo.com> New maximized visible window should be shown with ShowWindow(SW_SHOW). Patch: http://cvs.winehq.org/patch.py?id=21568 Old revision New revision Changes Path 1.105 1.106 +1 -1 wine/dlls/user/tests/msg.c 1.23 1.24 +1 -1 wine/dlls/user/win.c Index: wine/dlls/user/tests/msg.c diff -u -p wine/dlls/user/tests/msg.c:1.105 wine/dlls/user/tests/msg.c:1.106 --- wine/dlls/user/tests/msg.c:1.105 30 Nov 2005 12: 3:16 -0000 +++ wine/dlls/user/tests/msg.c 30 Nov 2005 12: 3:16 -0000 @@ -3117,7 +3117,7 @@ static void test_showwindow(void) hwnd = CreateWindowExA(0, "TestWindowClass", "Test popup", WS_POPUP | WS_MAXIMIZE | WS_VISIBLE, 100, 100, 200, 200, 0, 0, 0, NULL); ok (hwnd != 0, "Failed to create popup window\n"); - ok_sequence(WmCreateMaxPopupSeq, "CreateWindow(WS_MAXIMIZED):popup", TRUE); + ok_sequence(WmCreateMaxPopupSeq, "CreateWindow(WS_MAXIMIZED):popup", FALSE); trace("done\n"); DestroyWindow(hwnd); flush_sequence(); Index: wine/dlls/user/win.c diff -u -p wine/dlls/user/win.c:1.23 wine/dlls/user/win.c:1.24 --- wine/dlls/user/win.c:1.23 30 Nov 2005 12: 3:16 -0000 +++ wine/dlls/user/win.c 30 Nov 2005 12: 3:16 -0000 @@ -1068,7 +1068,7 @@ static HWND WIN_CreateWindowEx( CREATEST if (cs->style & WS_VISIBLE) { if (cs->style & WS_MAXIMIZE) - sw = SW_SHOWMAXIMIZED; + sw = SW_SHOW; else if (cs->style & WS_MINIMIZE) sw = SW_SHOWMINIMIZED;

1 0

wine/dlls user/tests/msg.c x11drv/window.c
by Alexandre Julliard Nov. 30, 2005

Nov. 30, 2005

ChangeSet ID: 21567 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/30 06:02:32 Modified files: dlls/user/tests: msg.c dlls/x11drv : window.c Log message: Vitaliy Margolen <wine-patch(a)kievinfo.com> CreateWindow should not activate invisible minimized or maximized windows. Add several tests to show the correct behavior. Patch: http://cvs.winehq.org/patch.py?id=21567 Old revision New revision Changes Path 1.104 1.105 +215 -0 wine/dlls/user/tests/msg.c 1.116 1.117 +4 -3 wine/dlls/x11drv/window.c

1 0

wine/dlls/version/tests install.c
by Alexandre Julliard Nov. 30, 2005

Nov. 30, 2005

ChangeSet ID: 21566 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/30 06:01:54 Modified files: dlls/version/tests: install.c Log message: Stefan Leichter <Stefan.Leichter(a)camLine.com> Fix version tests on windows 9x/ME. Patch: http://cvs.winehq.org/patch.py?id=21566 Old revision New revision Changes Path 1.2 1.3 +48 -6 wine/dlls/version/tests/install.c Index: wine/dlls/version/tests/install.c diff -u -p wine/dlls/version/tests/install.c:1.2 wine/dlls/version/tests/install.c:1.3 --- wine/dlls/version/tests/install.c:1.2 30 Nov 2005 12: 1:54 -0000 +++ wine/dlls/version/tests/install.c 30 Nov 2005 12: 1:54 -0000 @@ -43,11 +43,22 @@ static void test_find_file(void) memset(curdir, 0, MAX_PATH); memset(outBuf, 0, MAX_PATH); ret = VerFindFileA(0, "regedit", "", "", curdir, &dwCur, outBuf, &dwOut); - ok(!ret, "Wrong return value got %lx expected 0\n", ret); + switch(ret) { + case 0L: ok(dwCur == 1, "Wrong length of buffer for current location: " "got %d(%s) expected 1\n", dwCur, curdir); ok(dwOut == 1, "Wrong length of buffer for the recommended installation location: " "got %d(%s) expected 1\n", dwOut, outBuf); + break; + case VFF_BUFFTOOSMALL: + ok(dwCur == MAX_PATH, "Wrong length of buffer for current location: " + "got %d(%s) expected MAX_PATH\n", dwCur, curdir); + ok(dwOut == MAX_PATH, "Wrong length of buffer for the recommended installation location: " + "got %d(%s) expected MAX_PATH\n", dwOut, outBuf); + break; + default: + ok(0, "Got unexpected return value %lx\n", ret); + } if(!GetWindowsDirectoryA(windir, MAX_PATH)) trace("GetWindowsDirectoryA failed\n"); @@ -61,22 +72,44 @@ static void test_find_file(void) memset(curdir, 0, MAX_PATH); memset(outBuf, 0, MAX_PATH); ret = VerFindFileA(0, "regedit.exe", "", "", curdir, &dwCur, outBuf, &dwOut); - todo_wine ok(VFF_CURNEDEST == ret, "Wrong return value got %lx expected VFF_CURNEDEST\n", ret); - todo_wine ok(dwCur == 1 + strlen(windir), "Wrong length of buffer for current location: " + switch(ret) { + case VFF_CURNEDEST: + ok(dwCur == 1 + strlen(windir), "Wrong length of buffer for current location: " "got %d(%s) expected %d\n", dwCur, curdir, strlen(windir)+1); ok(dwOut == 1, "Wrong length of buffer for the recommended installation location: " "got %d(%s) expected 1\n", dwOut, outBuf); + break; + case VFF_BUFFTOOSMALL: + ok(dwCur == MAX_PATH, "Wrong length of buffer for current location: " + "got %d(%s) expected MAX_PATH\n", dwCur, curdir); + ok(dwOut == MAX_PATH, "Wrong length of buffer for the recommended installation location: " + "got %d(%s) expected MAX_PATH\n", dwOut, outBuf); + break; + default: + todo_wine ok(0, "Got unexpected return value %lx\n", ret); + } dwCur=MAX_PATH; dwOut=MAX_PATH; memset(curdir, 0, MAX_PATH); memset(outBuf, 0, MAX_PATH); ret = VerFindFileA(0, "regedit.exe", NULL, NULL, curdir, &dwCur, outBuf, &dwOut); - todo_wine ok(VFF_CURNEDEST == ret, "Wrong return value got %lx expected VFF_CURNEDEST\n", ret); - todo_wine ok(dwCur == 1 + strlen(windir), "Wrong length of buffer for current location: " + switch(ret) { + case VFF_CURNEDEST: + ok(dwCur == 1 + strlen(windir), "Wrong length of buffer for current location: " "got %d(%s) expected %d\n", dwCur, curdir, strlen(windir)+1); ok(dwOut == 1, "Wrong length of buffer for the recommended installation location: " "got %d(%s) expected 1\n", dwOut, outBuf); + break; + case VFF_BUFFTOOSMALL: + ok(dwCur == MAX_PATH, "Wrong length of buffer for current location: " + "got %d(%s) expected MAX_PATH\n", dwCur, curdir); + ok(dwOut == MAX_PATH, "Wrong length of buffer for the recommended installation location: " + "got %d(%s) expected MAX_PATH\n", dwOut, outBuf); + break; + default: + todo_wine ok(0, "Got unexpected return value %lx\n", ret); + } } } if(!GetModuleFileNameA(NULL, filename, MAX_PATH) || @@ -96,9 +129,18 @@ static void test_find_file(void) memset(outBuf, 0, MAX_PATH); memset(curdir, 0, MAX_PATH); ret = VerFindFileA(0, filename, NULL, NULL, curdir, &dwCur, outBuf, &dwOut); - todo_wine ok(VFF_CURNEDEST == ret, "Wrong return value got %lx expected VFF_CURNEDEST\n", ret); + switch(ret) { + case VFF_CURNEDEST: ok(dwOut == 1, "Wrong length of buffer for the recommended installation location" "got %d(%s) expected 1\n", dwOut, outBuf); + break; + case VFF_BUFFTOOSMALL: + ok(dwOut == MAX_PATH, "Wrong length of buffer for the recommended installation location" + "got %d(%s) expected MAX_PATH\n", dwOut, outBuf); + break; + default: + todo_wine ok(0, "Got unexpected return value %lx\n", ret); + } dwCur=MAX_PATH; dwOut=MAX_PATH;

1 0

wine/dlls/wininet/tests http.c
by Alexandre Julliard Nov. 30, 2005

Nov. 30, 2005

ChangeSet ID: 21565 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/30 06:01:49 Modified files: dlls/wininet/tests: http.c Log message: Robert Shearman <rob(a)codeweavers.com> Test the behaviour of HttpSendRequestEx when putting data into the lpvBuffer. Patch: http://cvs.winehq.org/patch.py?id=21565 Old revision New revision Changes Path 1.36 1.37 +6 -5 wine/dlls/wininet/tests/http.c Index: wine/dlls/wininet/tests/http.c diff -u -p wine/dlls/wininet/tests/http.c:1.36 wine/dlls/wininet/tests/http.c:1.37 --- wine/dlls/wininet/tests/http.c:1.36 30 Nov 2005 12: 1:49 -0000 +++ wine/dlls/wininet/tests/http.c 30 Nov 2005 12: 1:49 -0000 @@ -1066,6 +1066,7 @@ static void HttpSendRequestEx_test(void) DWORD dwBytesRead; CHAR szBuffer[256]; int i; + BOOL ret; static const char szPostData[] = "mode=Test"; static const char szContentType[] = "Content-Type: application/x-www-form-urlencoded"; @@ -1087,16 +1088,16 @@ static void HttpSendRequestEx_test(void) BufferIn.lpcszHeader = szContentType; BufferIn.dwHeadersLength = sizeof(szContentType); BufferIn.dwHeadersTotal = sizeof(szContentType); - BufferIn.lpvBuffer = NULL; - BufferIn.dwBufferLength = 0; + BufferIn.lpvBuffer = (LPVOID)szPostData; + BufferIn.dwBufferLength = 3; BufferIn.dwBufferTotal = sizeof(szPostData)-1; BufferIn.dwOffsetLow = 0; BufferIn.dwOffsetHigh = 0; - ok(HttpSendRequestEx(hRequest, &BufferIn, NULL, 0 ,0), - "SendRequestEx Failed\n"); + ret = HttpSendRequestEx(hRequest, &BufferIn, NULL, 0 ,0); + ok(ret, "HttpSendRequestEx Failed with error %ld\n", GetLastError()); - for (i = 0; szPostData[i]; i++) + for (i = 3; szPostData[i]; i++) ok(InternetWriteFile(hRequest, &szPostData[i], 1, &dwBytesWritten), "InternetWriteFile failed\n");

1 0

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

Nov. 30, 2005

ChangeSet ID: 21564 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/30 06:01:40 Modified files: dlls/wininet : http.c internet.c internet.h Log message: Robert Shearman <rob(a)codeweavers.com> Remove duplicated code by modifying HTTP_HttpSendRequest so that it can be used by both HttpSendRequest and HttpSendRequestEx. Also allow HttpSendRequestEx to be used asynchronously. Patch: http://cvs.winehq.org/patch.py?id=21564 Old revision New revision Changes Path 1.129 1.130 +75 -95 wine/dlls/wininet/http.c 1.147 1.148 +2 -1 wine/dlls/wininet/internet.c 1.45 1.46 +4 -1 wine/dlls/wininet/internet.h

1 0

wine/ dlls/netapi32/netapi32.c include/lm.h in ...
by Alexandre Julliard Nov. 30, 2005

Nov. 30, 2005

ChangeSet ID: 21563 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/30 06:01:12 Modified files: dlls/netapi32 : netapi32.c include : lm.h lmaccess.h lmserver.h lmwksta.h Log message: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Add some prototypes to include/ for already existing functions in netapi32. Patch: http://cvs.winehq.org/patch.py?id=21563 Old revision New revision Changes Path 1.22 1.23 +1 -0 wine/dlls/netapi32/netapi32.c 1.4 1.5 +1 -0 wine/include/lm.h 1.5 1.6 +9 -7 wine/include/lmaccess.h 1.2 1.3 +4 -3 wine/include/lmserver.h 1.4 1.5 +3 -2 wine/include/lmwksta.h Index: wine/dlls/netapi32/netapi32.c diff -u -p wine/dlls/netapi32/netapi32.c:1.22 wine/dlls/netapi32/netapi32.c:1.23 --- wine/dlls/netapi32/netapi32.c:1.22 30 Nov 2005 12: 1:12 -0000 +++ wine/dlls/netapi32/netapi32.c 30 Nov 2005 12: 1:12 -0000 @@ -19,6 +19,7 @@ #include "config.h" #include "wine/debug.h" +#include "lm.h" #include "netbios.h" WINE_DEFAULT_DEBUG_CHANNEL(netbios); Index: wine/include/lm.h diff -u -p wine/include/lm.h:1.4 wine/include/lm.h:1.5 --- wine/include/lm.h:1.4 30 Nov 2005 12: 1:12 -0000 +++ wine/include/lm.h 30 Nov 2005 12: 1:12 -0000 @@ -29,5 +29,6 @@ #include <lmapibuf.h> #include <lmstats.h> #include <lmjoin.h> +#include <lmserver.h> #endif Index: wine/include/lmaccess.h diff -u -p wine/include/lmaccess.h:1.5 wine/include/lmaccess.h:1.6 --- wine/include/lmaccess.h:1.5 30 Nov 2005 12: 1:12 -0000 +++ wine/include/lmaccess.h 30 Nov 2005 12: 1:12 -0000 @@ -403,13 +403,15 @@ typedef struct _NET_DISPLAY_GROUP { DWORD grpi3_next_index; } NET_DISPLAY_GROUP, *PNET_DISPLAY_GROUP; -NET_API_STATUS WINAPI NetUserGetInfo(LPCWSTR servername, LPCWSTR username, - DWORD level, LPBYTE* bufptr); - -NET_API_STATUS WINAPI NetQueryDisplayInformation( - LPCWSTR ServerName, DWORD Level, DWORD Index, DWORD EntriesRequested, - DWORD PreferredMaximumLength, LPDWORD ReturnedEntryCount, - PVOID *SortedBuffer); +NET_API_STATUS WINAPI NetGetDCName(LPCWSTR,LPCWSTR,LPBYTE*); +NET_API_STATUS WINAPI NetLocalGroupAdd(LPCWSTR,DWORD,LPBYTE,LPDWORD); +NET_API_STATUS WINAPI NetLocalGroupSetMembers(LPCWSTR,LPCWSTR,DWORD,LPBYTE,DWORD); +NET_API_STATUS WINAPI NetQueryDisplayInformation(LPCWSTR,DWORD,DWORD,DWORD,DWORD,LPDWORD,PVOID*); +NET_API_STATUS WINAPI NetUserAdd(LPCWSTR,DWORD,LPBYTE,LPDWORD); +NET_API_STATUS WINAPI NetUserDel(LPCWSTR,LPCWSTR); +NET_API_STATUS WINAPI NetUserEnum(LPCWSTR,DWORD,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD); +NET_API_STATUS WINAPI NetUserGetInfo(LPCWSTR,LPCWSTR,DWORD,LPBYTE*); +NET_API_STATUS WINAPI NetUserModalsGet(LPCWSTR,DWORD,LPBYTE*); #ifdef __cplusplus } Index: wine/include/lmserver.h diff -u -p wine/include/lmserver.h:1.2 wine/include/lmserver.h:1.3 --- wine/include/lmserver.h:1.2 30 Nov 2005 12: 1:12 -0000 +++ wine/include/lmserver.h 30 Nov 2005 12: 1:12 -0000 @@ -18,6 +18,8 @@ #ifndef _LMSERVER_ #define _LMSERVER_ +#include <winsvc.h> + #ifdef __cplusplus extern "C" { #endif @@ -36,9 +38,8 @@ typedef struct _SERVER_INFO_101 { LMSTR sv101_comment; } SERVER_INFO_101, *PSERVER_INFO_101, *LPSERVER_INFO_101; -NET_API_STATUS WINAPI NetServerEnum(LMCSTR servername, DWORD level, - LPBYTE *bufptr, DWORD prefmaxlen, LPDWORD entriesread, LPDWORD totalentries, - DWORD servertype, LMCSTR domain, LPDWORD resume_handle); +NET_API_STATUS WINAPI NetServerEnum(LPCWSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,DWORD,LPCWSTR,LPDWORD); +NET_API_STATUS WINAPI NetServerGetInfo(LMSTR,DWORD,LPBYTE*); BOOL WINAPI SetServiceBits(SERVICE_STATUS_HANDLE,DWORD,BOOL,BOOL); #define SV_TYPE_WORKSTATION 0x00000001 Index: wine/include/lmwksta.h diff -u -p wine/include/lmwksta.h:1.4 wine/include/lmwksta.h:1.5 --- wine/include/lmwksta.h:1.4 30 Nov 2005 12: 1:12 -0000 +++ wine/include/lmwksta.h 30 Nov 2005 12: 1:12 -0000 @@ -76,8 +76,9 @@ typedef struct _WKSTA_INFO_102 { } WKSTA_INFO_102, *PWKSTA_INFO_102, *LPWKSTA_INFO_102; /* workstation */ -NET_API_STATUS WINAPI NetWkstaUserGetInfo(LPWSTR reserved, DWORD level, PBYTE* bufptr); -NET_API_STATUS WINAPI NetWkstaGetInfo(LPWSTR servername, DWORD level, PBYTE *bufptr); +NET_API_STATUS WINAPI NetWkstaGetInfo(LPWSTR,DWORD,LPBYTE*); +NET_API_STATUS NET_API_FUNCTION NetWkstaTransportEnum(LPWSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD); +NET_API_STATUS WINAPI NetWkstaUserGetInfo(LPWSTR,DWORD,LPBYTE*); #ifdef __cplusplus }

1 0

wine/tools/winapi win16.api win32.api winapi_f ...
by Alexandre Julliard Nov. 30, 2005

Nov. 30, 2005

ChangeSet ID: 21562 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/30 06:01:04 Modified files: tools/winapi : win16.api win32.api winapi_function.pm winapi_local.pm winapi_parser.pm Log message: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Update win32.api to current cvs. Add __RPC_USER as a calling convention in winapi. Patch: http://cvs.winehq.org/patch.py?id=21562 Old revision New revision Changes Path 1.21 1.22 +0 -1 wine/tools/winapi/win16.api 1.58 1.59 +157 -30 wine/tools/winapi/win32.api 1.3 1.4 +2 -2 wine/tools/winapi/winapi_function.pm 1.4 1.5 +2 -2 wine/tools/winapi/winapi_local.pm 1.7 1.8 +3 -3 wine/tools/winapi/winapi_parser.pm

1 0

wine/ dlls/wined3d/directx.c include/wine/wine ...
by Alexandre Julliard Nov. 30, 2005

Nov. 30, 2005

ChangeSet ID: 21561 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/30 06:00:49 Modified files: dlls/wined3d : directx.c include/wine : wined3d_gl.h Log message: Raphael Junqueira <fenix(a)club-internet.fr> Add support for Intel drivers version string. Update default driver version (nvidia). Patch: http://cvs.winehq.org/patch.py?id=21561 Old revision New revision Changes Path 1.62 1.63 +24 -4 wine/dlls/wined3d/directx.c 1.12 1.13 +18 -7 wine/include/wine/wined3d_gl.h Index: wine/dlls/wined3d/directx.c diff -u -p wine/dlls/wined3d/directx.c:1.62 wine/dlls/wined3d/directx.c:1.63 --- wine/dlls/wined3d/directx.c:1.62 30 Nov 2005 12: 0:49 -0000 +++ wine/dlls/wined3d/directx.c 30 Nov 2005 12: 0:49 -0000 @@ -225,9 +225,11 @@ static BOOL IWineD3DImpl_FillGLCaps(Wine gotContext = TRUE; } - TRACE_(d3d_caps)("(%p, %p)\n", gl_info, display); + gl_string = (const char *) glGetString(GL_RENDERER); + strcpy(gl_info->gl_renderer, gl_string); + /* Fill in the GL info retrievable depending on the display */ if (NULL != display) { test = glXQueryVersion(display, &major, &minor); @@ -244,6 +246,9 @@ static BOOL IWineD3DImpl_FillGLCaps(Wine gl_info->gl_vendor = VENDOR_NVIDIA; } else if (strstr(gl_string, "ATI")) { gl_info->gl_vendor = VENDOR_ATI; + } else if (strstr(gl_string, "Intel(R)") || + strstr(gl_info->gl_renderer, "Intel(R)")) { + gl_info->gl_vendor = VENDOR_INTEL; } else if (strstr(gl_string, "Mesa")) { gl_info->gl_vendor = VENDOR_MESA; } else { @@ -319,6 +324,7 @@ static BOOL IWineD3DImpl_FillGLCaps(Wine } break; + case VENDOR_INTEL: case VENDOR_MESA: gl_string_cursor = strstr(gl_string, "Mesa"); gl_string_cursor = strstr(gl_string_cursor, " "); @@ -355,8 +361,6 @@ static BOOL IWineD3DImpl_FillGLCaps(Wine TRACE_(d3d_caps)("found GL_VERSION (%s)->(0x%08lx)\n", debugstr_a(gl_string), gl_info->gl_driver_version); /* Fill in the renderer information */ - gl_string = (const char *) glGetString(GL_RENDERER); - strcpy(gl_info->gl_renderer, gl_string); switch (gl_info->gl_vendor) { case VENDOR_NVIDIA: @@ -379,6 +383,22 @@ static BOOL IWineD3DImpl_FillGLCaps(Wine } break; + case VENDOR_INTEL: + if (strstr(gl_info->gl_renderer, "915GM")) { + gl_info->gl_card = CARD_INTEL_I915GM; + } else if (strstr(gl_info->gl_renderer, "915G")) { + gl_info->gl_card = CARD_INTEL_I915G; + } else if (strstr(gl_info->gl_renderer, "865G")) { + gl_info->gl_card = CARD_INTEL_I865G; + } else if (strstr(gl_info->gl_renderer, "855G")) { + gl_info->gl_card = CARD_INTEL_I855G; + } else if (strstr(gl_info->gl_renderer, "830G")) { + gl_info->gl_card = CARD_INTEL_I830G; + } else { + gl_info->gl_card = CARD_INTEL_I915G; + } + break; + default: gl_info->gl_card = CARD_WINE; break; @@ -995,7 +1015,7 @@ HRESULT WINAPI IWineD3DImpl_GetAdapterId strcpy(pIdentifier->Description, "Direct3D HAL"); if (NULL != pIdentifier->DeviceName) strcpy(pIdentifier->DeviceName, "\\\\.\\DISPLAY"); /* FIXME: May depend on desktop? */ pIdentifier->DriverVersion->u.HighPart = 0xa; - pIdentifier->DriverVersion->u.LowPart = MAKEDWORD_VERSION(53, 96); /* last Linux Nvidia drivers */ + pIdentifier->DriverVersion->u.LowPart = MAKEDWORD_VERSION(76, 76); /* last Linux Nvidia drivers */ *(pIdentifier->VendorId) = VENDOR_NVIDIA; *(pIdentifier->DeviceId) = CARD_NVIDIA_GEFORCE4_TI4600; *(pIdentifier->SubSysId) = 0; Index: wine/include/wine/wined3d_gl.h diff -u -p wine/include/wine/wined3d_gl.h:1.12 wine/include/wine/wined3d_gl.h:1.13 --- wine/include/wine/wined3d_gl.h:1.12 30 Nov 2005 12: 0:49 -0000 +++ wine/include/wine/wined3d_gl.h 30 Nov 2005 12: 0:49 -0000 @@ -846,16 +846,27 @@ typedef enum _GL_Vendors { VENDOR_WINE = 0x0, VENDOR_MESA = 0x1, VENDOR_ATI = 0x1002, - VENDOR_NVIDIA = 0x10de + VENDOR_NVIDIA = 0x10de, + VENDOR_INTEL = 0x8086 } GL_Vendors; typedef enum _GL_Cards { - CARD_WINE = 0x0, - CARD_ATI_RADEON_8500 = 0x514c, - CARD_ATI_RADEON_9700PRO = 0x4e44, - CARD_ATI_RADEON_9800PRO = 0x4e48, - CARD_NVIDIA_GEFORCE4_TI4600 = 0x0250, - CARD_NVIDIA_GEFORCEFX_5900ULTRA = 0x0330 + CARD_WINE = 0x0, + + CARD_ATI_RADEON_8500 = 0x514c, + CARD_ATI_RADEON_9700PRO = 0x4e44, + CARD_ATI_RADEON_9800PRO = 0x4e48, + + CARD_NVIDIA_GEFORCE4_TI4600 = 0x0250, + CARD_NVIDIA_GEFORCE4_TI4200 = 0x0281, + CARD_NVIDIA_GEFORCEFX_5900ULTRA = 0x0330, + + CARD_INTEL_845G = 0x2562, + CARD_INTEL_I830G = 0x3577, + CARD_INTEL_I855G = 0x3582, + CARD_INTEL_I865G = 0x2572, + CARD_INTEL_I915G = 0x2582, + CARD_INTEL_I915GM = 0x2592 } GL_Cards; typedef enum _GL_VSVersion {

1 0