November 2005 - Wine-Commits

wine/server winstation.c token.c timer.c threa ...
by Alexandre Julliard Nov. 22, 2005

Nov. 22, 2005

ChangeSet ID: 21400 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/22 08:55:42 Modified files: server : winstation.c token.c timer.c thread.c sock.c snapshot.c signal.c serial.c semaphore.c request.c registry.c queue.c process.c object.h object.c named_pipe.c mutex.c mapping.c mailslot.c hook.c handle.c file.c fd.c event.c debugger.c console.c clipboard.c change.c atom.c Log message: Vitaliy Margolen <wine-patch(a)kievinfo.com> Add name_lookup function in object_ops. Patch: http://cvs.winehq.org/patch.py?id=21400 Old revision New revision Changes Path 1.16 1.17 +2 -0 wine/server/winstation.c 1.15 1.16 +1 -0 wine/server/token.c 1.33 1.34 +1 -0 wine/server/timer.c 1.130 1.131 +1 -0 wine/server/thread.c 1.58 1.59 +1 -0 wine/server/sock.c 1.25 1.26 +1 -0 wine/server/snapshot.c 1.13 1.14 +1 -0 wine/server/signal.c 1.43 1.44 +1 -0 wine/server/serial.c 1.34 1.35 +1 -0 wine/server/semaphore.c 1.94 1.95 +1 -0 wine/server/request.c 1.82 1.83 +1 -0 wine/server/registry.c 1.71 1.72 +2 -0 wine/server/queue.c 1.144 1.145 +2 -0 wine/server/process.c 1.69 1.70 +10 -6 wine/server/object.h 1.39 1.40 +6 -0 wine/server/object.c 1.54 1.55 +3 -0 wine/server/named_pipe.c 1.34 1.35 +1 -0 wine/server/mutex.c 1.61 1.62 +1 -0 wine/server/mapping.c 1.14 1.15 +2 -0 wine/server/mailslot.c 1.17 1.18 +1 -0 wine/server/hook.c 1.42 1.43 +1 -0 wine/server/handle.c 1.100 1.101 +1 -0 wine/server/file.c 1.50 1.51 +4 -0 wine/server/fd.c 1.36 1.37 +1 -0 wine/server/event.c 1.59 1.60 +2 -0 wine/server/debugger.c 1.61 1.62 +3 -0 wine/server/console.c 1.7 1.8 +1 -0 wine/server/clipboard.c 1.26 1.27 +1 -0 wine/server/change.c 1.25 1.26 +1 -0 wine/server/atom.c

1 0

wine/dlls/commdlg fontdlg16.c
by Alexandre Julliard Nov. 22, 2005

Nov. 22, 2005

ChangeSet ID: 21399 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/22 08:54:29 Modified files: dlls/commdlg : fontdlg16.c Log message: Rein Klazes <wijn(a)wanadoo.nl> In CFn_CHOOSEFONT16to32W fix the conversion of the lpTemplateName and the lpszStyle fields. Patch: http://cvs.winehq.org/patch.py?id=21399 Old revision New revision Changes Path 1.17 1.18 +12 -14 wine/dlls/commdlg/fontdlg16.c Index: wine/dlls/commdlg/fontdlg16.c diff -u -p wine/dlls/commdlg/fontdlg16.c:1.17 wine/dlls/commdlg/fontdlg16.c:1.18 --- wine/dlls/commdlg/fontdlg16.c:1.17 22 Nov 2005 14:54:29 -0000 +++ wine/dlls/commdlg/fontdlg16.c 22 Nov 2005 14:54:29 -0000 @@ -58,7 +58,7 @@ static void FONT_LogFont16To32W( const L font32->lfPitchAndFamily = font16->lfPitchAndFamily; MultiByteToWideChar(CP_ACP, 0, font16->lfFaceName, LF_FACESIZE, font32->lfFaceName, LF_FACESIZE); -}; +} static void FONT_Metrics16To32W( const TEXTMETRIC16 *pm16, NEWTEXTMETRICEXW *pnm32w) @@ -67,24 +67,23 @@ static void FONT_Metrics16To32W( const T /* NOTE: only the fields used by AddFontStyle() are filled in */ pnm32w->ntmTm.tmHeight = pm16->tmHeight; pnm32w->ntmTm.tmExternalLeading = pm16->tmExternalLeading; -}; +} static void CFn_CHOOSEFONT16to32W(LPCHOOSEFONT16 chf16, LPCHOOSEFONTW chf32w) { int len; - if(chf16->lpTemplateName) + if (chf16->Flags & CF_ENABLETEMPLATE) { - len = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)chf16->lpTemplateName, -1, NULL, 0); - chf32w->lpTemplateName = HeapAlloc(GetProcessHeap(), 0,len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, (LPSTR)MapSL(chf16->lpTemplateName), - -1, (LPWSTR)chf32w->lpTemplateName, len); + len = MultiByteToWideChar( CP_ACP, 0, MapSL(chf16->lpTemplateName), -1, NULL, 0); + chf32w->lpTemplateName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar( CP_ACP, 0, MapSL(chf16->lpTemplateName), + -1, (LPWSTR)chf32w->lpTemplateName, len); } - if(chf16->lpszStyle) + if (chf16->Flags & CF_USESTYLE) { - len = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)chf16->lpszStyle, -1, NULL, 0); - chf32w->lpszStyle = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, (LPSTR)MapSL(chf16->lpTemplateName), - -1, chf32w->lpszStyle, len); + len = MultiByteToWideChar( CP_ACP, 0, MapSL(chf16->lpszStyle), -1, NULL, 0); + chf32w->lpszStyle = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar( CP_ACP, 0, MapSL(chf16->lpszStyle), -1, chf32w->lpszStyle, len); } chf32w->lStructSize=sizeof(CHOOSEFONTW); chf32w->hwndOwner=HWND_32(chf16->hwndOwner); @@ -95,12 +94,11 @@ static void CFn_CHOOSEFONT16to32W(LPCHOO chf32w->lCustData=chf16->lCustData; chf32w->lpfnHook=NULL; chf32w->hInstance=HINSTANCE_32(chf16->hInstance); - chf32w->lpszStyle=MapSL(chf16->lpszStyle); chf32w->nFontType=chf16->nFontType; chf32w->nSizeMax=chf16->nSizeMax; chf32w->nSizeMin=chf16->nSizeMin; FONT_LogFont16To32W(MapSL(chf16->lpLogFont), chf32w->lpLogFont); -}; +} /*********************************************************************** * CFn_HookCallChk [internal]

1 0

wine/programs/winebrowser Makefile.in
by Alexandre Julliard Nov. 22, 2005

Nov. 22, 2005

ChangeSet ID: 21398 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/22 08:53:36 Modified files: programs/winebrowser: Makefile.in Log message: Hans Leidekker <hans(a)it.vu.nl> No need to link against shell32 or user32. Patch: http://cvs.winehq.org/patch.py?id=21398 Old revision New revision Changes Path 1.3 1.4 +1 -1 wine/programs/winebrowser/Makefile.in Index: wine/programs/winebrowser/Makefile.in diff -u -p wine/programs/winebrowser/Makefile.in:1.3 wine/programs/winebrowser/Makefile.in:1.4 --- wine/programs/winebrowser/Makefile.in:1.3 22 Nov 2005 14:53:36 -0000 +++ wine/programs/winebrowser/Makefile.in 22 Nov 2005 14:53:36 -0000 @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winebrowser.exe APPMODE = -mconsole -IMPORTS = shell32 user32 advapi32 kernel32 +IMPORTS = advapi32 kernel32 C_SRCS = \ main.c

1 0

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

Nov. 22, 2005

ChangeSet ID: 21397 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/22 08:53:30 Modified files: dlls/wininet/tests: http.c dlls/wininet : http.c Log message: Aric Stewart <aric(a)codeweavers.com> Fix some logic to allow HTTP_ADDREQ_FLAG_ADD to replace existing headers. Also adding a test for some header adding flags. Patch: http://cvs.winehq.org/patch.py?id=21397 Old revision New revision Changes Path 1.33 1.34 +31 -1 wine/dlls/wininet/tests/http.c 1.112 1.113 +4 -2 wine/dlls/wininet/http.c Index: wine/dlls/wininet/tests/http.c diff -u -p wine/dlls/wininet/tests/http.c:1.33 wine/dlls/wininet/tests/http.c:1.34 --- wine/dlls/wininet/tests/http.c:1.33 22 Nov 2005 14:53:30 -0000 +++ wine/dlls/wininet/tests/http.c 22 Nov 2005 14:53:30 -0000 @@ -1113,7 +1113,36 @@ static void HttpSendRequestEx_test(void) ok(InternetCloseHandle(hConnect), "Close connect handle failed\n"); ok(InternetCloseHandle(hSession), "Close session handle failed\n"); } - + +static void HttpHeaders_test(void) +{ + HINTERNET hSession; + HINTERNET hConnect; + HINTERNET hRequest; + + hSession = InternetOpen("Wine Regression Test", + INTERNET_OPEN_TYPE_PRECONFIG,NULL,NULL,0); + ok( hSession != NULL ,"Unable to open Internet session\n"); + hConnect = InternetConnect(hSession, "crossover.codeweavers.com", + INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, 0, + 0); + ok( hConnect != NULL, "Unable to connect to http://crossover.codeweavers.com\n"); + hRequest = HttpOpenRequest(hConnect, "POST", "/posttest.php", + NULL, NULL, NULL, INTERNET_FLAG_NO_CACHE_WRITE, 0); + ok( hRequest != NULL, "Failed to open request handle\n"); + + ok(HttpAddRequestHeaders(hRequest,"Warning:test1",-1,HTTP_ADDREQ_FLAG_ADD), "Failed to add new header\n"); + ok(HttpAddRequestHeaders(hRequest,"Warning:test2",-1,HTTP_ADDREQ_FLAG_ADD), "Failed to replace header using HTTP_ADDREQ_FLAG_ADD\n"); + ok(HttpAddRequestHeaders(hRequest,"Warning:test3",-1,HTTP_ADDREQ_FLAG_REPLACE), "Failed to replace header using HTTP_ADDREQ_FLAG_REPLACE\n"); + ok(HttpAddRequestHeaders(hRequest,"Warning:test4",-1,HTTP_ADDREQ_FLAG_ADD_IF_NEW)==0, "HTTP_ADDREQ_FLAG_ADD_IF_NEW replaced existing header\n"); + + ok(InternetCloseHandle(hRequest), "Close request handle failed\n"); + ok(InternetCloseHandle(hConnect), "Close connect handle failed\n"); + ok(InternetCloseHandle(hSession), "Close session handle failed\n"); +} + + + START_TEST(http) { InternetReadFile_test(INTERNET_FLAG_ASYNC); @@ -1128,4 +1157,5 @@ START_TEST(http) InternetTimeToSystemTimeW_test(); InternetCreateUrlA_test(); HttpSendRequestEx_test(); + HttpHeaders_test(); } Index: wine/dlls/wininet/http.c diff -u -p wine/dlls/wininet/http.c:1.112 wine/dlls/wininet/http.c:1.113 --- wine/dlls/wininet/http.c:1.112 22 Nov 2005 14:53:30 -0000 +++ wine/dlls/wininet/http.c 22 Nov 2005 14:53:30 -0000 @@ -2692,7 +2692,8 @@ static BOOL HTTP_ProcessHeader(LPWININET else lphttpHdr->wFlags &= ~HDR_ISREQUEST; - if (!lphttpHdr->lpszValue && (dwModifier & (HTTP_ADDHDR_FLAG_ADD|HTTP_ADDHDR_FLAG_ADD_IF_NEW))) + if (!lphttpHdr->lpszValue && (dwModifier & HTTP_ADDHDR_FLAG_ADD || + dwModifier & HTTP_ADDHDR_FLAG_ADD_IF_NEW)) { INT slen; @@ -2718,7 +2719,8 @@ static BOOL HTTP_ProcessHeader(LPWININET } else if (lphttpHdr->lpszValue) { - if (dwModifier & HTTP_ADDHDR_FLAG_REPLACE) + if (dwModifier & HTTP_ADDHDR_FLAG_REPLACE || + dwModifier & HTTP_ADDHDR_FLAG_ADD) bSuccess = HTTP_ReplaceHeaderValue( lphttpHdr, value ); else if (dwModifier & COALESCEFLASG) {

1 0

wine/server registry.c
by Alexandre Julliard Nov. 22, 2005

Nov. 22, 2005

ChangeSet ID: 21396 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/22 06:05:36 Modified files: server : registry.c Log message: Use struct unicode_str instead of null-terminated strings where possible, and remove constraints on total key path length. Patch: http://cvs.winehq.org/patch.py?id=21396 Old revision New revision Changes Path 1.81 1.82 +214 -193 wine/server/registry.c

1 0

wine/server timer.c semaphore.c object.c mutex ...
by Alexandre Julliard Nov. 22, 2005

Nov. 22, 2005

ChangeSet ID: 21395 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/22 06:01:05 Modified files: server : timer.c semaphore.c object.c mutex.c event.c Log message: Robert Lunnon <bobl(a)optushome.com.au> Add stdarg.h where missing. Patch: http://cvs.winehq.org/patch.py?id=21395 Old revision New revision Changes Path 1.32 1.33 +1 -0 wine/server/timer.c 1.33 1.34 +1 -0 wine/server/semaphore.c 1.38 1.39 +1 -0 wine/server/object.c 1.33 1.34 +1 -0 wine/server/mutex.c 1.35 1.36 +1 -0 wine/server/event.c Index: wine/server/timer.c diff -u -p wine/server/timer.c:1.32 wine/server/timer.c:1.33 --- wine/server/timer.c:1.32 22 Nov 2005 12: 1: 5 -0000 +++ wine/server/timer.c 22 Nov 2005 12: 1: 5 -0000 @@ -26,6 +26,7 @@ #include <stdlib.h> #include <sys/time.h> #include <sys/types.h> +#include <stdarg.h> #include "windef.h" #include "winternl.h" Index: wine/server/semaphore.c diff -u -p wine/server/semaphore.c:1.33 wine/server/semaphore.c:1.34 --- wine/server/semaphore.c:1.33 22 Nov 2005 12: 1: 5 -0000 +++ wine/server/semaphore.c 22 Nov 2005 12: 1: 5 -0000 @@ -24,6 +24,7 @@ #include <assert.h> #include <stdio.h> #include <stdlib.h> +#include <stdarg.h> #include "windef.h" #include "winternl.h" Index: wine/server/object.c diff -u -p wine/server/object.c:1.38 wine/server/object.c:1.39 --- wine/server/object.c:1.38 22 Nov 2005 12: 1: 5 -0000 +++ wine/server/object.c 22 Nov 2005 12: 1: 5 -0000 @@ -27,6 +27,7 @@ #include <stdio.h> #include <string.h> #include <unistd.h> +#include <stdarg.h> #include "winternl.h" Index: wine/server/mutex.c diff -u -p wine/server/mutex.c:1.33 wine/server/mutex.c:1.34 --- wine/server/mutex.c:1.33 22 Nov 2005 12: 1: 5 -0000 +++ wine/server/mutex.c 22 Nov 2005 12: 1: 5 -0000 @@ -24,6 +24,7 @@ #include <assert.h> #include <stdio.h> #include <stdlib.h> +#include <stdarg.h> #include "windef.h" #include "winternl.h" Index: wine/server/event.c diff -u -p wine/server/event.c:1.35 wine/server/event.c:1.36 --- wine/server/event.c:1.35 22 Nov 2005 12: 1: 5 -0000 +++ wine/server/event.c 22 Nov 2005 12: 1: 5 -0000 @@ -24,6 +24,7 @@ #include <assert.h> #include <stdio.h> #include <stdlib.h> +#include <stdarg.h> #include "windef.h" #include "winternl.h"

1 0

wine/dlls/winsock socket.c
by Alexandre Julliard Nov. 22, 2005

Nov. 22, 2005

ChangeSet ID: 21394 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/22 06:00:43 Modified files: dlls/winsock : socket.c Log message: Marcus Meissner <meissner(a)suse.de> EAI_NONAME -> WS_EAI_NODATA, check for EAI_NONAME and EAI_NODATA. Patch: http://cvs.winehq.org/patch.py?id=21394 Old revision New revision Changes Path 1.196 1.197 +11 -0 wine/dlls/winsock/socket.c Index: wine/dlls/winsock/socket.c diff -u -p wine/dlls/winsock/socket.c:1.196 wine/dlls/winsock/socket.c:1.197 --- wine/dlls/winsock/socket.c:1.196 22 Nov 2005 12: 0:43 -0000 +++ wine/dlls/winsock/socket.c 22 Nov 2005 12: 0:43 -0000 @@ -332,7 +332,18 @@ static const int ws_eai_map[][2] = MAP_OPTION( EAI_FAIL ), MAP_OPTION( EAI_FAMILY ), MAP_OPTION( EAI_MEMORY ), +/* Note: EAI_NODATA is deprecated, but still + * used by Windows and Linux... We map the newer + * EAI_NONAME to EAI_NODATA for now until Windows + * changes too. + */ +#ifdef EAI_NODATA MAP_OPTION( EAI_NODATA ), +#endif +#ifdef EAI_NONAME + { WS_EAI_NODATA, EAI_NONAME }, +#endif + MAP_OPTION( EAI_SERVICE ), MAP_OPTION( EAI_SOCKTYPE ), { 0, 0 }

1 0

wine/dlls/ntdll version.c
by Alexandre Julliard Nov. 22, 2005

Nov. 22, 2005

ChangeSet ID: 21393 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/22 06:00:23 Modified files: dlls/ntdll : version.c Log message: Steven Edwards <winehacker(a)gmail.com> Correct URL for version infomation database website. Patch: http://cvs.winehq.org/patch.py?id=21393 Old revision New revision Changes Path 1.27 1.28 +1 -1 wine/dlls/ntdll/version.c Index: wine/dlls/ntdll/version.c diff -u -p wine/dlls/ntdll/version.c:1.27 wine/dlls/ntdll/version.c:1.28 --- wine/dlls/ntdll/version.c:1.27 22 Nov 2005 12: 0:23 -0000 +++ wine/dlls/ntdll/version.c 22 Nov 2005 12: 0:23 -0000 @@ -54,7 +54,7 @@ typedef enum /* FIXME: compare values below with original and fix. * An *excellent* win9x version page (ALL versions !) - * can be found at members.aol.com/axcel216/ver.htm */ + * can be found at www.mdgx.com/ver.htm */ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = { /* WIN20 FIXME: verify values */

1 0

wine/dlls/gdi/tests dc.c
by Alexandre Julliard Nov. 22, 2005

Nov. 22, 2005

ChangeSet ID: 21392 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/22 06:00:11 Modified files: dlls/gdi/tests : dc.c Log message: Dmitry Timoshkov <dmitry(a)codeweavers.com> Add a test showing that SaveDC after GetDC should return 1. Patch: http://cvs.winehq.org/patch.py?id=21392 Old revision New revision Changes Path 1.1 1.2 +94 -2 wine/dlls/gdi/tests/dc.c Index: wine/dlls/gdi/tests/dc.c diff -u -p wine/dlls/gdi/tests/dc.c:1.1 wine/dlls/gdi/tests/dc.c:1.2 --- wine/dlls/gdi/tests/dc.c:1.1 22 Nov 2005 12: 0:11 -0000 +++ wine/dlls/gdi/tests/dc.c 22 Nov 2005 12: 0:11 -0000 @@ -2,6 +2,7 @@ * Unit tests for dc functions * * Copyright (c) 2005 Huw Davies + * Copyright (c) 2005 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,7 +21,6 @@ #include <assert.h> #include <stdio.h> -#include <math.h> #include "wine/test.h" #include "winbase.h" @@ -28,8 +28,99 @@ #include "winuser.h" #include "winerror.h" +static void dump_region(HRGN hrgn) +{ + DWORD i, size; + RGNDATA *data = NULL; + RECT *rect; + + if (!hrgn) + { + printf( "(null) region\n" ); + return; + } + if (!(size = GetRegionData( hrgn, 0, NULL ))) return; + if (!(data = HeapAlloc( GetProcessHeap(), 0, size ))) return; + GetRegionData( hrgn, size, data ); + printf( "%ld rects:", data->rdh.nCount ); + for (i = 0, rect = (RECT *)data->Buffer; i < data->rdh.nCount; i++, rect++) + printf( " (%ld,%ld)-(%ld,%ld)", rect->left, rect->top, rect->right, rect->bottom ); + printf( "\n" ); + HeapFree( GetProcessHeap(), 0, data ); +} + +static void test_savedc_2(void) +{ + HWND hwnd; + HDC hdc; + HRGN hrgn; + RECT rc, rc_clip; + int ret; + + hwnd = CreateWindowExA(0, "static", "", WS_POPUP, 0,0,100,100, + 0, 0, 0, NULL); + assert(hwnd != 0); + ShowWindow(hwnd, SW_SHOW); + UpdateWindow(hwnd); + + hrgn = CreateRectRgn(0, 0, 0, 0); + assert(hrgn != 0); + + hdc = GetDC(hwnd); + ok(hdc != NULL, "CreateDC rets %p\n", hdc); + + ret = GetClipBox(hdc, &rc_clip); + ok(ret == SIMPLEREGION, "GetClipBox returned %d instead of SIMPLEREGION\n", ret); + ret = GetClipRgn(hdc, hrgn); + ok(ret == 0, "GetClipRgn returned %d instead of 0\n", ret); + ret = GetRgnBox(hrgn, &rc); + ok(ret == NULLREGION, "GetRgnBox returned %d (%ld,%ld-%ld,%ld) instead of NULLREGION\n", + ret, rc.left, rc.top, rc.right, rc.bottom); + /*dump_region(hrgn);*/ + SetRect(&rc, 0, 0, 100, 100); + ok(EqualRect(&rc, &rc_clip), + "rects are not equal: (%ld,%ld-%ld,%ld) - (%ld,%ld-%ld,%ld)\n", + rc.left, rc.top, rc.right, rc.bottom, + rc_clip.left, rc_clip.top, rc_clip.right, rc_clip.bottom); + + ret = SaveDC(hdc); +todo_wine +{ + ok(ret == 1, "ret = %d\n", ret); +} + + ret = IntersectClipRect(hdc, 0, 0, 50, 50); +#if 0 /* XP returns COMPLEXREGION although dump_region reports only 1 rect */ + ok(ret == SIMPLEREGION, "IntersectClipRect returned %d instead of SIMPLEREGION\n", ret); +#endif + if (ret != SIMPLEREGION) + { + trace("Windows BUG: IntersectClipRect returned %d instead of SIMPLEREGION\n", ret); + /* let's make sure that it's a simple region */ + ret = GetClipRgn(hdc, hrgn); + ok(ret == 1, "GetClipRgn returned %d instead of 1\n", ret); + dump_region(hrgn); + } + + ret = GetClipBox(hdc, &rc_clip); + ok(ret == SIMPLEREGION, "GetClipBox returned %d instead of SIMPLEREGION\n", ret); + SetRect(&rc, 0, 0, 50, 50); + ok(EqualRect(&rc, &rc_clip), "rects are not equal\n"); + + ret = RestoreDC(hdc, 1); + ok(ret, "ret = %d\n", ret); + + ret = GetClipBox(hdc, &rc_clip); + ok(ret == SIMPLEREGION, "GetClipBox returned %d instead of SIMPLEREGION\n", ret); + SetRect(&rc, 0, 0, 100, 100); + ok(EqualRect(&rc, &rc_clip), "rects are not equal\n"); + + DeleteObject(hrgn); + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); +} -void test_savedc(void) +static void test_savedc(void) { HDC hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); int ret; @@ -85,4 +176,5 @@ void test_savedc(void) START_TEST(dc) { test_savedc(); + test_savedc_2(); }

1 0

wine/dlls/shdocvw shdocvw.h oleobject.c client.c
by Alexandre Julliard Nov. 22, 2005

Nov. 22, 2005

ChangeSet ID: 21391 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/22 05:59:57 Modified files: dlls/shdocvw : shdocvw.h oleobject.c client.c Log message: Jacek Caban <jacek(a)codeweavers.com> Create window in SetClientSite and return it in IOleInPlaceSite::GetWindow. Patch: http://cvs.winehq.org/patch.py?id=21391 Old revision New revision Changes Path 1.31 1.32 +5 -0 wine/dlls/shdocvw/shdocvw.h 1.18 1.19 +92 -4 wine/dlls/shdocvw/oleobject.c 1.3 1.4 +5 -2 wine/dlls/shdocvw/client.c Index: wine/dlls/shdocvw/shdocvw.h diff -u -p wine/dlls/shdocvw/shdocvw.h:1.31 wine/dlls/shdocvw/shdocvw.h:1.32 --- wine/dlls/shdocvw/shdocvw.h:1.31 22 Nov 2005 11:59:57 -0000 +++ wine/dlls/shdocvw/shdocvw.h 22 Nov 2005 11:59:57 -0000 @@ -95,6 +95,9 @@ typedef struct { RECT clip_rect; OLEINPLACEFRAMEINFO frameinfo; + HWND doc_view_hwnd; + HWND shell_embedding_hwnd; + /* Connection points */ IConnectionPoint *cp_wbe2; @@ -144,4 +147,6 @@ extern LONG SHDOCVW_refCount; static inline void SHDOCVW_LockModule(void) { InterlockedIncrement( &SHDOCVW_refCount ); } static inline void SHDOCVW_UnlockModule(void) { InterlockedDecrement( &SHDOCVW_refCount ); } +extern HINSTANCE shdocvw_hinstance; + #endif /* __WINE_SHDOCVW_H */ Index: wine/dlls/shdocvw/oleobject.c diff -u -p wine/dlls/shdocvw/oleobject.c:1.18 wine/dlls/shdocvw/oleobject.c:1.19 --- wine/dlls/shdocvw/oleobject.c:1.18 22 Nov 2005 11:59:57 -0000 +++ wine/dlls/shdocvw/oleobject.c 22 Nov 2005 11:59:57 -0000 @@ -29,6 +29,84 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +static ATOM doc_view_atom = 0; +static ATOM shell_embedding_atom = 0; + +static LRESULT WINAPI doc_view_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + return DefWindowProcA(hwnd, msg, wParam, lParam); +} + +static LRESULT WINAPI shell_embedding_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + return DefWindowProcA(hwnd, msg, wParam, lParam); +} + +static void create_doc_view_hwnd(WebBrowser *This) +{ + static const WCHAR wszShell_DocObject_View[] = + {'S','h','e','l','l',' ','D','o','c','O','b','j','e','c','t',' ','V','i','e','w',0}; + + if(!doc_view_atom) { + static WNDCLASSEXW wndclass = { + sizeof(wndclass), + CS_PARENTDC, + doc_view_proc, + 0, 0 /* native uses 4*/, NULL, NULL, NULL, + (HBRUSH)COLOR_WINDOWFRAME, NULL, + wszShell_DocObject_View, + NULL + }; + + wndclass.hInstance = shdocvw_hinstance; + + doc_view_atom = RegisterClassExW(&wndclass); + } + + This->doc_view_hwnd = CreateWindowExW(0, wszShell_DocObject_View, NULL, + WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP | WS_MAXIMIZEBOX, + 0, 0, 0, 0, This->shell_embedding_hwnd, + NULL, shdocvw_hinstance, This); +} + +static void create_shell_embedding_hwnd(WebBrowser *This) +{ + IOleInPlaceSite *inplace; + HWND parent = NULL; + HRESULT hres; + + static const WCHAR wszShellEmbedding[] = + {'S','h','e','l','l',' ','E','m','b','e','d','d','i','n','g',0}; + + if(!shell_embedding_atom) { + static WNDCLASSEXW wndclass = { + sizeof(wndclass), + CS_DBLCLKS, + shell_embedding_proc, + 0, 0 /* native uses 8 */, NULL, NULL, NULL, + (HBRUSH)COLOR_WINDOWFRAME, NULL, + wszShellEmbedding, + NULL + }; + wndclass.hInstance = shdocvw_hinstance; + + RegisterClassExW(&wndclass); + } + + hres = IOleClientSite_QueryInterface(This->client, &IID_IOleInPlaceSite, (void**)&inplace); + if(SUCCEEDED(hres)) { + IOleInPlaceSite_GetWindow(inplace, &parent); + IOleInPlaceSite_Release(inplace); + } + + This->shell_embedding_hwnd = CreateWindowExW(0, wszShellEmbedding, NULL, + WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP | WS_MAXIMIZEBOX, + 0, 0, 0, 0, parent, + NULL, shdocvw_hinstance, This); + + create_doc_view_hwnd(This); +} + /********************************************************************** * Implement the IOleObject interface for the WebBrowser control */ @@ -62,13 +140,22 @@ static HRESULT WINAPI OleObject_SetClien if(This->client == pClientSite) return S_OK; + if(This->doc_view_hwnd) + DestroyWindow(This->doc_view_hwnd); + if(This->shell_embedding_hwnd) + DestroyWindow(This->shell_embedding_hwnd); + if(This->client) IOleClientSite_Release(This->client); - if(pClientSite) - IOleClientSite_AddRef(pClientSite); - This->client = pClientSite; + if(!pClientSite) + return S_OK; + + IOleClientSite_AddRef(pClientSite); + + create_shell_embedding_hwnd(This); + return S_OK; } @@ -176,6 +263,7 @@ static HRESULT WINAPI OleObject_DoVerb(I &This->pos_rect, &This->clip_rect, &This->frameinfo); + IOleInPlaceSite_Release(inplace); if(This->client) { @@ -507,7 +595,7 @@ void WebBrowser_OleObject_Init(WebBrowse void WebBrowser_OleObject_Destroy(WebBrowser *This) { if(This->client) - IOleClientSite_Release(This->client); + IOleObject_SetClientSite(OLEOBJ(This), NULL); if(This->container) IOleContainer_Release(This->container); if(This->frame) Index: wine/dlls/shdocvw/client.c diff -u -p wine/dlls/shdocvw/client.c:1.3 wine/dlls/shdocvw/client.c:1.4 --- wine/dlls/shdocvw/client.c:1.3 22 Nov 2005 11:59:57 -0000 +++ wine/dlls/shdocvw/client.c 22 Nov 2005 11:59:57 -0000 @@ -151,8 +151,11 @@ static ULONG WINAPI InPlaceSite_Release( static HRESULT WINAPI InPlaceSite_GetWindow(IOleInPlaceSite *iface, HWND *phwnd) { WebBrowser *This = INPLACESITE_THIS(iface); - FIXME("(%p)->(%p)\n", This, phwnd); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, phwnd); + + *phwnd = This->doc_view_hwnd; + return S_OK; } static HRESULT WINAPI InPlaceSite_ContextSensitiveHelp(IOleInPlaceSite *iface, BOOL fEnterMode)

1 0