wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

Alexandre Julliard : Revert "gdi32: Pre-multiply RGB values by alpha for subpixel font rendering."
by Alexandre Julliard 28 May '10

28 May '10

Module: wine Branch: master Commit: aa9c78170363699491c1abe3efa45b2100eb0803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa9c78170363699491c1abe3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 28 00:09:21 2010 +0200 Revert "gdi32: Pre-multiply RGB values by alpha for subpixel font rendering." This reverts commit aff0eac21b7d66a0ba4869cade6368a988ab34ee. The RGB values are already alpha values, they don't need to be pre-multiplied. --- dlls/gdi32/freetype.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 53732c4..ddb3d24 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5025,22 +5025,19 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, { for ( x = 0; x < src_width / hmul; x++ ) { - unsigned int alpha = (src[hmul * x + rgb_interval * 0] + - src[hmul * x + rgb_interval * 1] + - src[hmul * x + rgb_interval * 2]) / 3; if ( rgb ) { - dst[x] = ((src[hmul * x + rgb_interval * 0] * alpha / 255) << 16) | - ((src[hmul * x + rgb_interval * 1] * alpha / 255) << 8) | - ((src[hmul * x + rgb_interval * 2] * alpha / 255) << 0) | - (alpha << 24); + dst[x] = ((unsigned int)src[hmul * x + rgb_interval * 0] << 16) | + ((unsigned int)src[hmul * x + rgb_interval * 1] << 8) | + ((unsigned int)src[hmul * x + rgb_interval * 2] << 0) | + ((unsigned int)src[hmul * x + rgb_interval * 1] << 24) ; } else { - dst[x] = ((src[hmul * x + rgb_interval * 2] * alpha / 255) << 16) | - ((src[hmul * x + rgb_interval * 1] * alpha / 255) << 8) | - ((src[hmul * x + rgb_interval * 0] * alpha / 255) << 0) | - (alpha << 24); + dst[x] = ((unsigned int)src[hmul * x + rgb_interval * 2] << 16) | + ((unsigned int)src[hmul * x + rgb_interval * 1] << 8) | + ((unsigned int)src[hmul * x + rgb_interval * 0] << 0) | + ((unsigned int)src[hmul * x + rgb_interval * 1] << 24) ; } } src += src_pitch * vmul;

1 0

André Hentschel : German translation of release news 1 .2-rc1
by Jeremy Newman 27 May '10

27 May '10

Module: website Branch: master Commit: 106d50bd6eb92832987f8837f420a2a3ab9311f9 URL: http://source.winehq.org/git/website.git/?a=commit;h=106d50bd6eb92832987f88… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 24 19:41:48 2010 +0200 German translation of release news 1.2-rc1 --- news/de/2010052101.xml | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/news/de/2010052101.xml b/news/de/2010052101.xml new file mode 100644 index 0000000..91187ee --- /dev/null +++ b/news/de/2010052101.xml @@ -0,0 +1,20 @@ +<news> +<date>21. Mai 2010</date> +<title>Wine 1.2-rc1 Freigegeben</title> +<body> + Die Entwicklungsversion 1.2-rc1 von Wine ist jetzt verfügbar. + Das ist der erste Release Candidate für Wine 1.2. Es läutet den Anfang des Code-Freeze ein. Bitte testet das Release gut durch um uns zu helfen 1.2 so gut wie möglich zu machen. + <a href="{$root}/announce/1.2-rc1">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Viele neue Symbolleisten Icons.</li> + <li>Unterstützung für Alpha blending in Image Listen.</li> + <li>Viel vollständigerer Shader Assembler.</li> + <li>Unterstützung für verbundene, arabische Schrift.</li> + <li>Einige Behebungen für Video Rendering.</li> + <li>Schrift Antialiasing Konfiguration per fontconfig.</li> + <li>Verbesserte Handhabung von Desktop Links.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.2-rc1.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : winedump: Don't include winbase16.h.
by Alexandre Julliard 27 May '10

27 May '10

Module: wine Branch: master Commit: a72f3f3075e68987a71e1ca607f154e161553e3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a72f3f3075e68987a71e1ca60… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 27 17:09:14 2010 +0200 winedump: Don't include winbase16.h. --- tools/winedump/ne.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 47 insertions(+), 3 deletions(-) diff --git a/tools/winedump/ne.c b/tools/winedump/ne.c index 9328ccf..992d885 100644 --- a/tools/winedump/ne.c +++ b/tools/winedump/ne.c @@ -30,7 +30,6 @@ #include "windef.h" #include "winbase.h" -#include "wine/winbase16.h" #include "winedump.h" struct ne_segtable_entry @@ -50,6 +49,23 @@ struct relocation_entry WORD target2; /* Target specification */ }; +typedef struct +{ + WORD offset; + WORD length; + WORD flags; + WORD id; + WORD handle; + WORD usage; +} NE_NAMEINFO; + +typedef struct +{ + WORD type_id; + WORD count; + DWORD resloader; +} NE_TYPEINFO; + #define NE_RADDR_LOWBYTE 0 #define NE_RADDR_SELECTOR 2 #define NE_RADDR_POINTER32 3 @@ -63,6 +79,34 @@ struct relocation_entry #define NE_RELTYPE_OSFIXUP 3 #define NE_RELFLAG_ADDITIVE 4 +#define NE_SEGFLAGS_DATA 0x0001 +#define NE_SEGFLAGS_ALLOCATED 0x0002 +#define NE_SEGFLAGS_LOADED 0x0004 +#define NE_SEGFLAGS_ITERATED 0x0008 +#define NE_SEGFLAGS_MOVEABLE 0x0010 +#define NE_SEGFLAGS_SHAREABLE 0x0020 +#define NE_SEGFLAGS_PRELOAD 0x0040 +#define NE_SEGFLAGS_EXECUTEONLY 0x0080 +#define NE_SEGFLAGS_READONLY 0x0080 +#define NE_SEGFLAGS_RELOC_DATA 0x0100 +#define NE_SEGFLAGS_SELFLOAD 0x0800 +#define NE_SEGFLAGS_DISCARDABLE 0x1000 +#define NE_SEGFLAGS_32BIT 0x2000 + +#define NE_RSCTYPE_CURSOR 0x8001 +#define NE_RSCTYPE_BITMAP 0x8002 +#define NE_RSCTYPE_ICON 0x8003 +#define NE_RSCTYPE_MENU 0x8004 +#define NE_RSCTYPE_DIALOG 0x8005 +#define NE_RSCTYPE_STRING 0x8006 +#define NE_RSCTYPE_FONTDIR 0x8007 +#define NE_RSCTYPE_FONT 0x8008 +#define NE_RSCTYPE_ACCELERATOR 0x8009 +#define NE_RSCTYPE_RCDATA 0x800a +#define NE_RSCTYPE_GROUP_CURSOR 0x800c +#define NE_RSCTYPE_GROUP_ICON 0x800e +#define NE_RSCTYPE_SCALABLE_FONTPATH 0x80cc + static inline WORD get_word( const BYTE *ptr ) { return ptr[0] | (ptr[1] << 8); @@ -78,8 +122,8 @@ static void dump_ne_header( const IMAGE_OS2_HEADER *ne ) printf( "Auto data segment: %x\n", ne->ne_autodata ); printf( "Heap size: %d bytes\n", ne->ne_heap ); printf( "Stack size: %d bytes\n", ne->ne_stack ); - printf( "Stack pointer: %x:%04x\n", SELECTOROF(ne->ne_sssp), OFFSETOF(ne->ne_sssp) ); - printf( "Entry point: %x:%04x\n", SELECTOROF(ne->ne_csip), OFFSETOF(ne->ne_csip) ); + printf( "Stack pointer: %x:%04x\n", HIWORD(ne->ne_sssp), LOWORD(ne->ne_sssp) ); + printf( "Entry point: %x:%04x\n", HIWORD(ne->ne_csip), LOWORD(ne->ne_csip) ); printf( "Number of segments: %d\n", ne->ne_cseg ); printf( "Number of modrefs: %d\n", ne->ne_cmod ); printf( "Segment table: %x\n", ne->ne_segtab );

1 0

Alexandre Julliard : version: Don't include winbase16.h.
by Alexandre Julliard 27 May '10

27 May '10

Module: wine Branch: master Commit: c94e7645a48f6639d94f9a8db18772b3e5426195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c94e7645a48f6639d94f9a8db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 27 17:04:12 2010 +0200 version: Don't include winbase16.h. --- dlls/version/resource.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/version/resource.c b/dlls/version/resource.c index e27a967..64d39dd 100644 --- a/dlls/version/resource.c +++ b/dlls/version/resource.c @@ -39,10 +39,25 @@ #include "winver.h" #include "wine/unicode.h" -#include "wine/winbase16.h" - #include "wine/debug.h" +typedef struct +{ + WORD offset; + WORD length; + WORD flags; + WORD id; + WORD handle; + WORD usage; +} NE_NAMEINFO; + +typedef struct +{ + WORD type_id; + WORD count; + DWORD resloader; +} NE_TYPEINFO; + WINE_DEFAULT_DEBUG_CHANNEL(ver);

1 0

Alexandre Julliard : user32: Don't include winbase16.h.
by Alexandre Julliard 27 May '10

27 May '10

Module: wine Branch: master Commit: ed4846bed92d9c6e2bafa83d729863de018a978e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed4846bed92d9c6e2bafa83d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 27 17:04:08 2010 +0200 user32: Don't include winbase16.h. --- dlls/user32/exticon.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/user32/exticon.c b/dlls/user32/exticon.c index a720cf3..fb9ff03 100644 --- a/dlls/user32/exticon.c +++ b/dlls/user32/exticon.c @@ -37,7 +37,7 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "wine/winbase16.h" +#include "winnls.h" #include "user_private.h" #include "wine/debug.h" @@ -65,6 +65,26 @@ typedef struct icoICONDIRENTRY idEntries[1]; /* An entry for each image (idCount of 'em) */ } icoICONDIR, *LPicoICONDIR; +typedef struct +{ + WORD offset; + WORD length; + WORD flags; + WORD id; + WORD handle; + WORD usage; +} NE_NAMEINFO; + +typedef struct +{ + WORD type_id; + WORD count; + DWORD resloader; +} NE_TYPEINFO; + +#define NE_RSCTYPE_ICON 0x8003 +#define NE_RSCTYPE_GROUP_ICON 0x800e + #include "poppack.h" #if 0

1 0

Marcus Meissner : include: Pack NE_NAMEINFO and NE_TYPEINFO pack(1).
by Alexandre Julliard 27 May '10

27 May '10

Module: wine Branch: master Commit: 122bfcc18526ad51021b987d53b322e1d525a662 URL: http://source.winehq.org/git/wine.git/?a=commit;h=122bfcc18526ad51021b987d5… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu May 27 15:40:48 2010 +0200 include: Pack NE_NAMEINFO and NE_TYPEINFO pack(1). --- include/wine/winbase16.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h index aaa3336..b70ecd6 100644 --- a/include/wine/winbase16.h +++ b/include/wine/winbase16.h @@ -217,8 +217,6 @@ enum arg_types ARG_VARARG /* start of varargs */ }; -#include <poppack.h> - #define INVALID_HANDLE_VALUE16 ((HANDLE16) -1) #define INFINITE16 0xFFFF @@ -315,6 +313,7 @@ typedef struct #define NE_RSCTYPE_GROUP_ICON 0x800e #define NE_RSCTYPE_SCALABLE_FONTPATH 0x80cc /* Resource found in .fot files */ +#include <poppack.h> #define __AHSHIFT 3 /* don't change! */ #define __AHINCR (1 << __AHSHIFT)

1 0

Austin English : qedit: Fix return value of DllUnregisterServer.
by Alexandre Julliard 27 May '10

27 May '10

Module: wine Branch: master Commit: caf0e0befee9622f3ebed0f2a7da71794ca361e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caf0e0befee9622f3ebed0f2a… Author: Austin English <austinenglish(a)gmail.com> Date: Sat May 22 01:23:56 2010 -0500 qedit: Fix return value of DllUnregisterServer. --- dlls/qedit/regsvr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qedit/regsvr.c b/dlls/qedit/regsvr.c index d70c822..d007311 100644 --- a/dlls/qedit/regsvr.c +++ b/dlls/qedit/regsvr.c @@ -326,5 +326,5 @@ HRESULT WINAPI DllUnregisterServer(void) TRACE("\n"); hr = unregister_coclasses(coclass_list); - return S_OK; + return hr; }

1 0

Marcus Meissner : wininet: Check for NULL lpwhh (Coverity).
by Alexandre Julliard 27 May '10

27 May '10

Module: wine Branch: master Commit: b7f3aa61f43c5beac32ef51285dd0dee78df491c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7f3aa61f43c5beac32ef5128… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed May 26 09:53:55 2010 +0200 wininet: Check for NULL lpwhh (Coverity). --- dlls/wininet/internet.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 5b1913a..fd93276 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2581,6 +2581,11 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, } case INTERNET_OPTION_CONTEXT_VALUE: { + if (!lpwhh) + { + SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); + return FALSE; + } if (!lpBuffer || dwBufferLength != sizeof(DWORD_PTR)) { SetLastError(ERROR_INVALID_PARAMETER);

1 0

Thomas Mullaly : urlmon/tests: Added tests for IUri_GetPropertyDWORD.
by Alexandre Julliard 27 May '10

27 May '10

Module: wine Branch: master Commit: 7bc121c8802299d88ef01b0de8063247f936f4dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bc121c8802299d88ef01b0de… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed May 26 17:42:12 2010 -0400 urlmon/tests: Added tests for IUri_GetPropertyDWORD. --- dlls/urlmon/tests/uri.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 15 ++++++ include/urlmon.idl | 10 ++++ 3 files changed, 148 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 453fde7..cff1a08 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -37,8 +37,10 @@ #include "windef.h" #include "winbase.h" #include "urlmon.h" +#include "shlwapi.h" #define URI_STR_PROPERTY_COUNT Uri_PROPERTY_STRING_LAST+1 +#define URI_DWORD_PROPERTY_COUNT (Uri_PROPERTY_DWORD_LAST - Uri_PROPERTY_DWORD_START)+1 static HRESULT (WINAPI *pCreateUri)(LPCWSTR, DWORD, DWORD_PTR, IUri**); @@ -65,6 +67,12 @@ typedef struct _uri_str_property { BOOL todo; } uri_str_property; +typedef struct _uri_dword_property { + DWORD value; + HRESULT expected; + BOOL todo; +} uri_dword_property; + typedef struct _uri_properties { const char* uri; DWORD create_flags; @@ -72,6 +80,7 @@ typedef struct _uri_properties { BOOL create_todo; uri_str_property str_props[URI_STR_PROPERTY_COUNT]; + uri_dword_property dword_props[URI_DWORD_PROPERTY_COUNT]; } uri_properties; static const uri_properties uri_tests[] = { @@ -92,6 +101,12 @@ static const uri_properties uri_tests[] = { {"http",S_OK,TRUE}, /* SCHEME_NAME */ {"",S_FALSE,TRUE}, /* USER_INFO */ {"",S_FALSE,TRUE} /* USER_NAME */ + }, + { + {Uri_HOST_DNS,S_OK,TRUE}, /* HOST_TYPE */ + {80,S_OK,TRUE}, /* PORT */ + {URL_SCHEME_HTTP,S_OK,TRUE}, /* SCHEME */ + {URLZONE_INVALID,E_NOTIMPL,FALSE} /* ZONE */ } }, { "http://winehq.org/tests/.././tests", 0, S_OK, FALSE, @@ -111,6 +126,12 @@ static const uri_properties uri_tests[] = { {"http",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} + }, + { + {Uri_HOST_DNS,S_OK,TRUE}, + {80,S_OK,TRUE}, + {URL_SCHEME_HTTP,S_OK,TRUE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, { "HtTp://www.winehq.org/tests/..?query=x&return=y", 0, S_OK, FALSE, @@ -130,6 +151,12 @@ static const uri_properties uri_tests[] = { {"http",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} + }, + { + {Uri_HOST_DNS,S_OK,TRUE}, + {80,S_OK,TRUE}, + {URL_SCHEME_HTTP,S_OK,TRUE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE}, } }, { "hTTp://us%45r%3Ainfo@examp%4CE.com:80/path/a/b/./c/../%2E%2E/Forbidden'<|> Characters", 0, S_OK, FALSE, @@ -149,6 +176,12 @@ static const uri_properties uri_tests[] = { {"http",S_OK,TRUE}, {"usEr%3Ainfo",S_OK,TRUE}, {"usEr%3Ainfo",S_OK,TRUE} + }, + { + {Uri_HOST_DNS,S_OK,TRUE}, + {80,S_OK,TRUE}, + {URL_SCHEME_HTTP,S_OK,TRUE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE}, } }, { "ftp://winepass:wine@ftp.winehq.org:9999/dir/foo bar.txt", 0, S_OK, FALSE, @@ -168,6 +201,12 @@ static const uri_properties uri_tests[] = { {"ftp",S_OK,TRUE}, {"winepass:wine",S_OK,TRUE}, {"winepass",S_OK,TRUE} + }, + { + {Uri_HOST_DNS,S_OK,TRUE}, + {9999,S_OK,TRUE}, + {URL_SCHEME_FTP,S_OK,TRUE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, { "file://c:\\tests\\../tests/foo%20bar.mp3", 0, S_OK, FALSE, @@ -187,6 +226,12 @@ static const uri_properties uri_tests[] = { {"file",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,TRUE}, + {0,S_FALSE,TRUE}, + {URL_SCHEME_FILE,S_OK,TRUE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, { "FILE://localhost/test dir\\../tests/test%20file.README.txt", 0, S_OK, FALSE, @@ -206,6 +251,12 @@ static const uri_properties uri_tests[] = { {"file",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,TRUE}, + {0,S_FALSE,TRUE}, + {URL_SCHEME_FILE,S_OK,TRUE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, { "urn:nothing:should:happen here", 0, S_OK, FALSE, @@ -225,6 +276,12 @@ static const uri_properties uri_tests[] = { {"urn",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,TRUE}, + {0,S_FALSE,TRUE}, + {URL_SCHEME_UNKNOWN,S_OK,TRUE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} } } }; @@ -340,6 +397,69 @@ static void test_IUri_GetPropertyBSTR(void) { } } +static void test_IUri_GetPropertyDWORD(void) { + IUri *uri = NULL; + HRESULT hr; + DWORD i; + + hr = pCreateUri(http_urlW, 0, 0, &uri); + ok(hr == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK); + if(SUCCEEDED(hr)) { + hr = IUri_GetPropertyDWORD(uri, Uri_PROPERTY_DWORD_START, NULL, 0); + ok(hr == E_INVALIDARG, "Error: GetPropertyDWORD returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); + } + if(uri) IUri_Release(uri); + + for(i = 0; i < sizeof(uri_tests)/sizeof(uri_tests[0]); ++i) { + uri_properties test = uri_tests[i]; + LPWSTR uriW; + uri = NULL; + + uriW = a2w(test.uri); + hr = pCreateUri(uriW, test.create_flags, 0, &uri); + if(test.create_todo) { + todo_wine { + ok(hr == test.create_expected, "Error: CreateUri returned 0x%08x, expected 0x%08x. Failed on uri_tests[%d].\n", + hr, test.create_expected, i); + } + } else { + ok(hr == test.create_expected, "Error: CreateUri returned 0x%08x, expected 0x%08x. Failed on uri_tests[%d].\n", + hr, test.create_expected, i); + } + + if(SUCCEEDED(hr)) { + DWORD j; + + /* Checks all the DWORD properties of the uri. */ + for(j = 0; j < sizeof(test.dword_props)/sizeof(test.dword_props[0]); ++j) { + DWORD received; + uri_dword_property prop = test.dword_props[j]; + + hr = IUri_GetPropertyDWORD(uri, j+Uri_PROPERTY_DWORD_START, &received, 0); + if(prop.todo) { + todo_wine { + ok(hr == prop.expected, "GetPropertyDWORD returned 0x%08x, expected 0x%08x. On uri_tests[%d].dword_props[%d].\n", + hr, prop.expected, i, j); + } + todo_wine { + ok(prop.value == received, "Expected %d but got %d on uri_tests[%d].dword_props[%d].\n", + prop.value, received, i, j); + } + } else { + ok(hr == prop.expected, "GetPropertyDWORD returned 0x%08x, expected 0x%08x. On uri_tests[%d].dword_props[%d].\n", + hr, prop.expected, i, j); + ok(prop.value == received, "Expected %d but got %d on uri_tests[%d].dword_props[%d].\n", + prop.value, received, i, j); + } + } + } + + if(uri) IUri_Release(uri); + + heap_free(uriW); + } +} + START_TEST(uri) { HMODULE hurlmon; @@ -359,4 +479,7 @@ START_TEST(uri) { trace("test IUri_GetPropertyBSTR...\n"); test_IUri_GetPropertyBSTR(); + + trace("test IUri_GetPropretyDWORD...\n"); + test_IUri_GetPropertyDWORD(); } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 5b72fa5..9018002 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -1,5 +1,6 @@ /* * Copyright 2010 Jacek Caban for CodeWeavers + * Copyright 2010 Thomas Mullaly * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -97,6 +98,20 @@ static HRESULT WINAPI Uri_GetPropertyDWORD(IUri *iface, Uri_PROPERTY uriProp, DW { Uri *This = URI_THIS(iface); FIXME("(%p)->(%d %p %x)\n", This, uriProp, pcchProperty, dwFlags); + + if(!pcchProperty) + return E_INVALIDARG; + + /* Microsoft's implementation for the ZONE property of a URI seems to be lacking... + * From what I can tell, instead of checking which URLZONE the URI belongs to it + * simply assigns URLZONE_INVALID and returns E_NOTIMPL. This also applies the GetZone + * function. + */ + if(uriProp == Uri_PROPERTY_ZONE) { + *pcchProperty = URLZONE_INVALID; + return E_NOTIMPL; + } + return E_NOTIMPL; } diff --git a/include/urlmon.idl b/include/urlmon.idl index 2ab3b2b..c1d3bec 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1231,6 +1231,7 @@ interface IInternetZoneManager : IUnknown typedef enum tagURLZONE { + URLZONE_INVALID = -1, URLZONE_PREDEFINED_MIN = 0, URLZONE_LOCAL_MACHINE = 0, URLZONE_INTRANET = 1, @@ -1563,6 +1564,15 @@ interface IUri : IUnknown Uri_PROPERTY_DWORD_LAST = Uri_PROPERTY_ZONE } Uri_PROPERTY; + typedef enum + { + Uri_HOST_UNKNOWN = 0, + Uri_HOST_DNS = 1, + Uri_HOST_IPV4 = 2, + Uri_HOST_IPV6 = 3, + Uri_HOST_IDN = 4 + } Uri_HOST_TYPE; + HRESULT GetPropertyBSTR( [in] Uri_PROPERTY uriProp, [out] BSTR *pbstrProperty,

1 0

Thomas Mullaly : urlmon/tests: Added tests for IUri_GetPropertyBSTR.
by Alexandre Julliard 27 May '10

27 May '10

Module: wine Branch: master Commit: d68e88718ddf6a58abcc59f902383e5317084836 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d68e88718ddf6a58abcc59f90… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed May 26 16:30:32 2010 -0400 urlmon/tests: Added tests for IUri_GetPropertyBSTR. --- dlls/urlmon/tests/Makefile.in | 2 +- dlls/urlmon/tests/uri.c | 254 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 255 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d68e88718ddf6a58abcc5…

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2010