December 2006 - Wine-commits

Jacek Caban : mshtml: Added beginning of IDM_PRINT implementation.
by Alexandre Julliard 13 Dec '06

13 Dec '06

Module: wine Branch: master Commit: 7aa9ea4ec03e67c5c98005e5c1c155811e6bfe0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aa9ea4ec03e67c5c98005e5c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 12 21:56:37 2006 +0100 mshtml: Added beginning of IDM_PRINT implementation. --- dlls/mshtml/nsiface.idl | 140 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/olecmd.c | 44 ++++++++++++++- 2 files changed, 182 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7aa9ea4ec03e67c5c9800…

1 0

Pierre d'Herbemont : kernel32: Remove unneeded headers.
by Alexandre Julliard 13 Dec '06

13 Dec '06

Module: wine Branch: master Commit: 5ff751156da4a1f8f3c2882ba0b647495d184682 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ff751156da4a1f8f3c2882ba… Author: Pierre d'Herbemont <pdherbemont(a)free.fr> Date: Wed Dec 13 13:43:03 2006 +0100 kernel32: Remove unneeded headers. --- dlls/kernel32/locale.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 16310a0..fcb8f18 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -31,12 +31,10 @@ #include <stdio.h> #include <ctype.h> #include <stdlib.h> -#include <sys/types.h> #ifdef __APPLE__ # include <CoreFoundation/CFBundle.h> # include <CoreFoundation/CFLocale.h> -# include <CoreFoundation/CFPreferences.h> # include <CoreFoundation/CFString.h> #endif

1 0

Vitaliy Margolen : winex11.drv: Only events with MOUSEEVENTF_MOVE flag should change mouse position.
by Alexandre Julliard 13 Dec '06

13 Dec '06

Module: wine Branch: master Commit: b13681797aa27f42f79f50c980d5b98151f3bbcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b13681797aa27f42f79f50c98… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue Dec 12 15:57:22 2006 -0700 winex11.drv: Only events with MOUSEEVENTF_MOVE flag should change mouse position. --- dlls/user32/tests/input.c | 25 +++++++++++++++++++++++-- dlls/winex11.drv/mouse.c | 9 ++++++--- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index c024960..bfd8c10 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -568,7 +568,7 @@ static LRESULT CALLBACK hook_proc2( int if (code == HC_ACTION) { ok(hook->pt.x == pt_new.x && hook->pt.y == pt_new.y, - "Wrong hook coords: (%d,%d)\n", pt_new.x, pt_new.y); + "Wrong hook coords: (%d %d) != (%d,%d)\n", hook->pt.x, hook->pt.y, pt_new.x, pt_new.y); /* Should match position set above */ GetCursorPos(&pt); @@ -582,7 +582,7 @@ static void test_mouse_ll_hook(void) { HWND hwnd; HHOOK hook1, hook2; - POINT pt_org; + POINT pt_org, pt; GetCursorPos(&pt_org); hwnd = CreateWindow("static", "Title", WS_OVERLAPPEDWINDOW, @@ -607,6 +607,27 @@ static void test_mouse_ll_hook(void) ok(pt_old.x == pt_new.x && pt_old.y == pt_new.y, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); UnhookWindowsHookEx(hook1); + + /* Now check that mouse buttons do not change mouse position + if we don't have MOUSEEVENTF_MOVE flag specified. */ + + /* We reusing the same hook callback, so make it happy */ + pt_old.x = pt_new.x - STEP; + pt_old.y = pt_new.y - STEP; + mouse_event(MOUSEEVENTF_LEFTUP, 123, 456, 0, 0); + GetCursorPos(&pt); + ok(pt.x == pt_new.x && pt.y == pt_new.y, "Position changed: (%d,%d)\n", pt.x, pt.y); + mouse_event(MOUSEEVENTF_RIGHTUP, 456, 123, 0, 0); + GetCursorPos(&pt); + ok(pt.x == pt_new.x && pt.y == pt_new.y, "Position changed: (%d,%d)\n", pt.x, pt.y); + + mouse_event(MOUSEEVENTF_LEFTUP | MOUSEEVENTF_ABSOLUTE, 123, 456, 0, 0); + GetCursorPos(&pt); + ok(pt.x == pt_new.x && pt.y == pt_new.y, "Position changed: (%d,%d)\n", pt.x, pt.y); + mouse_event(MOUSEEVENTF_RIGHTUP | MOUSEEVENTF_ABSOLUTE, 456, 123, 0, 0); + GetCursorPos(&pt); + ok(pt.x == pt_new.x && pt.y == pt_new.y, "Position changed: (%d,%d)\n", pt.x, pt.y); + UnhookWindowsHookEx(hook2); DestroyWindow(hwnd); SetCursorPos(pt_org.x, pt_org.y); diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 5067acd..e2c7dd0 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -216,7 +216,7 @@ void X11DRV_send_mouse_input( HWND hwnd, { POINT pt; - if (flags & MOUSEEVENTF_ABSOLUTE) + if (flags & MOUSEEVENTF_MOVE && flags & MOUSEEVENTF_ABSOLUTE) { if (injected_flags & LLMHF_INJECTED) { @@ -227,6 +227,9 @@ void X11DRV_send_mouse_input( HWND hwnd, { pt.x = x; pt.y = y; + wine_tsx11_lock(); + if (cursor_pos.x == x && cursor_pos.y == y) flags &= ~MOUSEEVENTF_MOVE; + wine_tsx11_unlock(); } wine_tsx11_lock(); cursor_pos = pt; @@ -748,7 +751,7 @@ void X11DRV_ButtonPress( HWND hwnd, XEve update_mouse_state( hwnd, event->window, event->x, event->y, event->state, &pt ); - X11DRV_send_mouse_input( hwnd, button_down_flags[buttonNum] | MOUSEEVENTF_ABSOLUTE, + X11DRV_send_mouse_input( hwnd, button_down_flags[buttonNum] | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, pt.x, pt.y, wData, EVENT_x11_time_to_win32_time(event->time), 0, 0 ); } @@ -778,7 +781,7 @@ void X11DRV_ButtonRelease( HWND hwnd, XE update_mouse_state( hwnd, event->window, event->x, event->y, event->state, &pt ); - X11DRV_send_mouse_input( hwnd, button_up_flags[buttonNum] | MOUSEEVENTF_ABSOLUTE, + X11DRV_send_mouse_input( hwnd, button_up_flags[buttonNum] | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, pt.x, pt.y, wData, EVENT_x11_time_to_win32_time(event->time), 0, 0 ); }

1 0

Dmitry Timoshkov : kernel32: Add the data that mimics the PE image which upack creates.
by Alexandre Julliard 13 Dec '06

13 Dec '06

Module: wine Branch: master Commit: 64b2ca25739b668a2c7f09c933299ea8de847877 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64b2ca25739b668a2c7f09c93… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sat Dec 9 20:26:30 2006 +0800 kernel32: Add the data that mimics the PE image which upack creates. --- dlls/kernel32/tests/loader.c | 176 +++++++++++++++++++++++++++++++---------- 1 files changed, 133 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64b2ca25739b668a2c7f0…

1 0

Alexandre Julliard : ntdll: Map the PE header up to the specified size, and clear the rest of the page.
by Alexandre Julliard 13 Dec '06

13 Dec '06

Module: wine Branch: master Commit: 3dc21d387ba3506275a775ba79663ecf88e794a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dc21d387ba3506275a775ba7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 13 13:06:12 2006 +0100 ntdll: Map the PE header up to the specified size, and clear the rest of the page. --- dlls/kernel32/tests/loader.c | 6 ------ dlls/ntdll/virtual.c | 9 ++++++--- server/mapping.c | 4 ++-- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 48771ba..7ae70f3 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -360,12 +360,6 @@ START_TEST(loader) start = (const char *)hlib + nt_header.OptionalHeader.SizeOfHeaders; size = ALIGN_SIZE((ULONG_PTR)start, si.dwPageSize) - (ULONG_PTR)start; - /* remove next 'if' and todo_wine once Wine is fixed */ - if (nt_header.OptionalHeader.SizeOfHeaders < nt_header.OptionalHeader.FileAlignment) - { -todo_wine ok(!memcmp(start, filler, size), "%d: header alignment is not cleared\n", i); - } - else ok(!memcmp(start, filler, size), "%d: header alignment is not cleared\n", i); } diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 2b1ff24..ff16adc 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -974,11 +974,12 @@ static NTSTATUS map_image( HANDLE hmappi status = STATUS_INVALID_IMAGE_FORMAT; /* generic error */ if (!st.st_size) goto error; header_size = min( header_size, st.st_size ); - if (map_file_into_view( view, fd, 0, header_size, 0, VPROT_COMMITTED | VPROT_READ, + if (map_file_into_view( view, fd, 0, header_size, 0, VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, removable ) != STATUS_SUCCESS) goto error; dos = (IMAGE_DOS_HEADER *)ptr; nt = (IMAGE_NT_HEADERS *)(ptr + dos->e_lfanew); header_end = ptr + ROUND_SIZE( 0, header_size ); + memset( ptr + header_size, 0, header_end - (ptr + header_size) ); if ((char *)(nt + 1) > header_end) goto error; sec = (IMAGE_SECTION_HEADER*)((char*)&nt->OptionalHeader+nt->FileHeader.SizeOfOptionalHeader); if ((char *)(sec + nt->FileHeader.NumberOfSections) > header_end) goto error; @@ -1067,8 +1068,8 @@ static NTSTATUS map_image( HANDLE hmappi end = sec->VirtualAddress + ROUND_SIZE( sec->VirtualAddress, map_size ); if (sec->VirtualAddress > total_size || end > total_size || end < sec->VirtualAddress) { - ERR_(module)( "Section %.8s too large (%x+%lx/%lx)\n", - sec->Name, sec->VirtualAddress, map_size, total_size ); + WARN_(module)( "Section %.8s too large (%x+%lx/%lx)\n", + sec->Name, sec->VirtualAddress, map_size, total_size ); goto error; } @@ -1166,6 +1167,8 @@ static NTSTATUS map_image( HANDLE hmappi /* set the image protections */ + VIRTUAL_SetProt( view, ptr, ROUND_SIZE( 0, header_size ), VPROT_COMMITTED | VPROT_READ ); + sec = (IMAGE_SECTION_HEADER*)((char *)&nt->OptionalHeader+nt->FileHeader.SizeOfOptionalHeader); for (i = 0; i < nt->FileHeader.NumberOfSections; i++, sec++) { diff --git a/server/mapping.c b/server/mapping.c index d526e75..052ea41 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -243,11 +243,11 @@ static int get_image_params( struct mapp mapping->size = ROUND_SIZE( nt.OptionalHeader.SizeOfImage ); mapping->base = (void *)nt.OptionalHeader.ImageBase; - mapping->header_size = pos + size; + mapping->header_size = max( pos + size, nt.OptionalHeader.SizeOfHeaders ); mapping->protect = VPROT_IMAGE; /* sanity check */ - if (mapping->header_size > mapping->size) goto error; + if (pos + size > mapping->size) goto error; free( sec ); release_object( fd );

1 0

Andrew Talbot : msvcrt/tests: Cast-qual warnings fix.
by Alexandre Julliard 13 Dec '06

13 Dec '06

Module: wine Branch: master Commit: ac550a88efa66ba361cebbc03681e7f5975301a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac550a88efa66ba361cebbc03… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Dec 12 21:43:55 2006 +0000 msvcrt/tests: Cast-qual warnings fix. --- dlls/msvcrt/tests/file.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index bfeaf75..7294ff9 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -138,10 +138,12 @@ static void test_readmode( BOOL ascii_mo static const char outbuffer[] = "0,1,2,3,4,5,6,7,8,9\r\n\r\nA,B,C,D,E\r\nX,Y,Z"; static const char padbuffer[] = "ghjghjghjghj"; static const char nlbuffer[] = "\r\n"; - char buffer[2*BUFSIZ+256], *optr; + char buffer[2*BUFSIZ+256]; + const char *optr; int fd; FILE *file; - int i, j, m, fp, ao, *ip, pl; + const int *ip; + int i, j, m, fp, ao, pl; long l; fd = open ("fdopen.tst", O_WRONLY | O_CREAT | O_BINARY, _S_IREAD |_S_IWRITE); @@ -215,7 +217,7 @@ static void test_readmode( BOOL ascii_mo for (m=0; m<3; m++) ok(buffer[m]==padbuffer[m+(BUFSIZ-4)%strlen(padbuffer)],"expected %c got %c\n", padbuffer[m], buffer[m]); m+=BUFSIZ+2+ao; - optr = (char *)outbuffer; + optr = outbuffer; for (; m<i; m++) { ok(buffer[m]==*optr,"char %d expected %c got %c in %s\n", m, *optr, buffer[m], IOMODE); optr++; @@ -246,7 +248,7 @@ static void test_readmode( BOOL ascii_mo ok(ftell(file) == 0,"Did not start at beginning of file in %s\n", IOMODE); ok(fgets(buffer,2*BUFSIZ+256,file) !=0,"padding line fgets failed unexpected in %s\n", IOMODE); i = _getw(file); - ip = (int *)outbuffer; + ip = (const int *)outbuffer; ok(i == *ip,"_getw failed, expected %08x got %08x in %s\n", *ip, i, IOMODE); for (fp=0; fp<strlen(outbuffer); fp++) if (outbuffer[fp] == '\n') break; @@ -266,7 +268,7 @@ static void test_readmode( BOOL ascii_mo } -static WCHAR* AtoW( char* p ) +static WCHAR* AtoW( const char* p ) { WCHAR* buffer; DWORD len = MultiByteToWideChar( CP_ACP, 0, p, -1, NULL, 0 ); @@ -329,7 +331,7 @@ static void test_fgetwc( void ) l=ftell(tempfh); ok(l==BUFSIZ-2+strlen(mytext), "ftell expected %d got %ld\n", BUFSIZ-2+strlen(mytext), l); - mytextW = AtoW ((char*)mytext); + mytextW = AtoW (mytext); aptr = mytextW; wptr = wtextW; for (i=0; i<strlen(mytext)-2; i++, aptr++, wptr++) @@ -493,7 +495,7 @@ static void test_file_put_get( void ) fclose(tempfh); tempfh = fopen(tempf,"rt"); /* open in TEXT mode */ fgetws(wtextW,LLEN,tempfh); - mytextW = AtoW ((char*)mytext); + mytextW = AtoW (mytext); aptr = mytextW; wptr = wtextW;

1 0

Jacek Caban : urlmon: Added application/x-msdownload mime filter.
by Alexandre Julliard 13 Dec '06

13 Dec '06

Module: wine Branch: master Commit: 35e0e994ce6b50da15cbfb4ca1125bb5229fe7fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=35e0e994ce6b50da15cbfb4ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 12 21:53:48 2006 +0100 urlmon: Added application/x-msdownload mime filter. --- dlls/urlmon/tests/misc.c | 10 +++++++++- dlls/urlmon/urlmon_main.c | 8 ++++++++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 6c13a3d..5a0b081 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -347,6 +347,8 @@ static const WCHAR mimeAppXGzip[] = {'a' 'x','-','g','z','i','p','-','c','o','m','p','r','e','s','s','e','d',0}; static const WCHAR mimeAppJava[] = {'a','p','p','l','i','c','a','t','i','o','n','/','j','a','v','a',0}; static const WCHAR mimeAppPdf[] = {'a','p','p','l','i','c','a','t','i','o','n','/','p','d','f',0}; +static const WCHAR mimeAppXMSDownload[] = + {'a','p','p','l','i','c','a','t','i','o','n','/','x','-','m','s','d','o','w','n','l','o','a','d',0}; static const struct { LPCWSTR url; @@ -428,6 +430,9 @@ static BYTE data64[] = {0xca,0xfe,0xba,0 static BYTE data65[] = {0x25,0x50,0x44,0x46,'x'}; static BYTE data66[] = {0x25,0x50,0x44,0x46}; static BYTE data67[] = {0x25,0x50,0x44,0x46,'x','<','h','t','m','l','>'}; +static BYTE data68[] = {'M','Z','x'}; +static BYTE data69[] = {'M','Z'}; +static BYTE data70[] = {'M','Z','<','h','t','m','l','>',0xff}; static const struct { BYTE *data; @@ -500,7 +505,10 @@ static const struct { {data64, sizeof(data64), mimeTextHtml}, {data65, sizeof(data65), mimeAppPdf}, {data66, sizeof(data66), mimeTextPlain}, - {data67, sizeof(data67), mimeTextHtml} + {data67, sizeof(data67), mimeTextHtml}, + {data68, sizeof(data68), mimeAppXMSDownload}, + {data69, sizeof(data69), mimeTextPlain}, + {data70, sizeof(data70), mimeTextHtml} }; static void test_FindMimeFromData(void) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index a352f30..8196f23 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -489,6 +489,11 @@ static BOOL application_java_filter(cons return size > 4 && b[0] == 0xca && b[1] == 0xfe && b[2] == 0xba && b[3] == 0xbe; } +static BOOL application_xmsdownload(const BYTE const *b, DWORD size) +{ + return size > 2 && b[0] == 'M' && b[1] == 'Z'; +} + static BOOL text_plain_filter(const BYTE const *b, DWORD size) { const BYTE *ptr; @@ -557,6 +562,8 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC 'x','-','g','z','i','p','-','c','o','m','p','r','e','s','s','e','d',0}; static const WCHAR wszAppJava[] = {'a','p','p','l','i','c','a','t','i','o','n','/', 'j','a','v','a',0}; + static const WCHAR wszAppXMSDownload[] = {'a','p','p','l','i','c','a','t','i','o','n','/', + 'x','-','m','s','d','o','w','n','l','o','a','d',0}; static const WCHAR wszTextPlain[] = {'t','e','x','t','/','p','l','a','i','n','\0'}; static const WCHAR wszAppOctetStream[] = {'a','p','p','l','i','c','a','t','i','o','n','/', 'o','c','t','e','t','-','s','t','r','e','a','m','\0'}; @@ -577,6 +584,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC {wszAppXZip, application_xzip_filter}, {wszAppXGzip, application_xgzip_filter}, {wszAppJava, application_java_filter}, + {wszAppXMSDownload, application_xmsdownload}, {wszTextPlain, text_plain_filter}, {wszAppOctetStream, application_octet_stream_filter} };

1 0

Jacek Caban : urlmon: Use pluggable protocol in CoInternetCompareUrl.
by Alexandre Julliard 13 Dec '06

13 Dec '06

Module: wine Branch: master Commit: bb52f14d59f7a6abf8a099bf7998798821640b98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb52f14d59f7a6abf8a099bf7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 12 21:54:47 2006 +0100 urlmon: Use pluggable protocol in CoInternetCompareUrl. --- dlls/urlmon/internet.c | 21 +++++++++++++++++++++ dlls/urlmon/tests/misc.c | 15 +++++++++++++++ dlls/urlmon/urlmon_main.c | 6 ------ 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index 0897e93..68692c1 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -236,3 +236,24 @@ HRESULT WINAPI CoInternetCombineUrl(LPCW return hres; } + +/************************************************************************** + * CoInternetCompareUrl (URLMON.@) + */ +HRESULT WINAPI CoInternetCompareUrl(LPCWSTR pwzUrl1, LPCWSTR pwzUrl2, DWORD dwCompareFlags) +{ + IInternetProtocolInfo *protocol_info; + HRESULT hres; + + TRACE("(%s,%s,%08x)\n", debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags); + + protocol_info = get_protocol_info(pwzUrl1); + + if(protocol_info) { + hres = IInternetProtocolInfo_CompareUrl(protocol_info, pwzUrl1, pwzUrl2, dwCompareFlags); + if(SUCCEEDED(hres)) + return hres; + } + + return UrlCompareW(pwzUrl1, pwzUrl2, dwCompareFlags) ? S_FALSE : S_OK; +} diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 5a0b081..fedd15d 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -328,6 +328,20 @@ static void test_CoInternetParseUrl(void } } +static void test_CoInternetCompareUrl(void) +{ + HRESULT hres; + + hres = CoInternetCompareUrl(url1, url1, 0); + ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); + + hres = CoInternetCompareUrl(url1, url3, 0); + ok(hres == S_FALSE, "CoInternetParseUrl failed: %08x\n", hres); + + hres = CoInternetCompareUrl(url3, url1, 0); + ok(hres == S_FALSE, "CoInternetParseUrl failed: %08x\n", hres); +} + static const WCHAR mimeTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; static const WCHAR mimeTextPlain[] = {'t','e','x','t','/','p','l','a','i','n',0}; static const WCHAR mimeAppOctetStream[] = {'a','p','p','l','i','c','a','t','i','o','n','/', @@ -1081,6 +1095,7 @@ START_TEST(misc) test_CreateFormatEnum(); test_RegisterFormatEnumerator(); test_CoInternetParseUrl(); + test_CoInternetCompareUrl(); test_FindMimeFromData(); test_SecurityManager(); test_ZoneManager(); diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 8196f23..8ec8424 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -303,12 +303,6 @@ HRESULT WINAPI ObtainUserAgentString(DWO return S_OK; } -HRESULT WINAPI CoInternetCompareUrl(LPCWSTR pwzUrl1, LPCWSTR pwzUrl2, DWORD dwCompareFlags) -{ - TRACE("(%s,%s,%08x)\n", debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags); - return UrlCompareW(pwzUrl1, pwzUrl2, dwCompareFlags)==0?S_OK:S_FALSE; -} - /************************************************************************** * IsValidURL (URLMON.@) *

1 0

Andrew Talbot : ntdll/tests: Cast-qual warning fix.
by Alexandre Julliard 13 Dec '06

13 Dec '06

Module: wine Branch: master Commit: 9cf1579aadbf50e5e788fb4b177f9e0ebfe55f12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cf1579aadbf50e5e788fb4b1… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Dec 12 21:45:42 2006 +0000 ntdll/tests: Cast-qual warning fix. --- dlls/ntdll/rtl.c | 2 +- dlls/ntdll/tests/rtl.c | 2 +- include/winternl.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 21866ef..3ff5cb0 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -583,7 +583,7 @@ VOID WINAPI RtlFillMemoryUlong(ULONG* lp * RETURNS * The cumulative CRC32 of dwInitial and iLen bytes of the pData block. */ -DWORD WINAPI RtlComputeCrc32(DWORD dwInitial, PBYTE pData, INT iLen) +DWORD WINAPI RtlComputeCrc32(DWORD dwInitial, const BYTE *pData, INT iLen) { DWORD crc = ~dwInitial; diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 8d7f227..8a5611c 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -844,7 +844,7 @@ static void test_RtlComputeCrc32(void) if (!pRtlComputeCrc32) return; - crc = pRtlComputeCrc32(crc, (LPBYTE)src, LEN); + crc = pRtlComputeCrc32(crc, (const BYTE *)src, LEN); ok(crc == 0x40861dc2,"Expected 0x40861dc2, got %8x\n", crc); } diff --git a/include/winternl.h b/include/winternl.h index 9509176..19b2ac9 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1986,7 +1986,7 @@ PDEBUG_BUFFER WINAPI RtlCreateQueryDebug ULONG WINAPI RtlCompactHeap(HANDLE,ULONG); LONG WINAPI RtlCompareString(const STRING*,const STRING*,BOOLEAN); LONG WINAPI RtlCompareUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); -DWORD WINAPI RtlComputeCrc32(DWORD,PBYTE,INT); +DWORD WINAPI RtlComputeCrc32(DWORD,const BYTE*,INT); NTSTATUS WINAPI RtlConvertSidToUnicodeString(PUNICODE_STRING,PSID,BOOLEAN); LONGLONG WINAPI RtlConvertLongToLargeInteger(LONG); ULONGLONG WINAPI RtlConvertUlongToLargeInteger(ULONG);

1 0

Clinton Stimpson : usp10: Add tests and fix for ScriptXtoCP .
by Alexandre Julliard 12 Dec '06

12 Dec '06

Module: wine Branch: master Commit: 39a5b0760c49c5d03bab99320f70927782fd0192 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39a5b0760c49c5d03bab99320… Author: Clinton Stimpson <cjstimpson(a)utwire.net> Date: Mon Dec 11 22:23:53 2006 -0700 usp10: Add tests and fix for ScriptXtoCP . --- dlls/usp10/tests/usp10.c | 19 +++++++++++++++++++ dlls/usp10/usp10.c | 7 ++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 45988d6..c6ffd8a 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -574,6 +574,25 @@ static void test_ScriptXtoX(void) ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); ok(piCP == 4, "iX=%d should return piCP=4 not %d\n", iX, piCP); + iX = 0; + cChars = 10; + cGlyphs = 10; + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); + ok(piCP == 0, "iX=%d should return piCP=0 not %d\n", iX, piCP); + iX = 195; + cChars = 10; + cGlyphs = 10; + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); + ok(piCP == 0, "iX=%d should return piCP=0 not %d\n", iX, piCP); + iX = 196; + cChars = 10; + cGlyphs = 10; + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); + ok(piCP == 1, "iX=%d should return piCP=1 not %d\n", iX, piCP); + iCP=5; fTrailing = FALSE; cChars = 10; diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 9fd6c1e..5f88138 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -561,7 +561,7 @@ HRESULT WINAPI ScriptXtoCP(int iX, int *piTrailing) { int item; - int iPosX = 1; + int iPosX; float fMaxPosX = 1; float fAvePosX; TRACE("(%d,%d,%d,%p,%p,%p,%p,%p,%p)\n", @@ -585,8 +585,9 @@ HRESULT WINAPI ScriptXtoCP(int iX, } fAvePosX = fMaxPosX / cGlyphs; - for (item = 0; item < cGlyphs && iPosX < iX; item++) - iPosX = fAvePosX * (item +1); + iPosX = fAvePosX; + for (item = 1; item < cGlyphs && iPosX < iX; item++) + iPosX += fAvePosX; if (iPosX - iX > fAvePosX/2) *piTrailing = 0; else

1 0