July 2010 - Wine-Commits - list.winehq.org

Thomas Mullaly : urlmon: Fixed a bug that would cause tests to randomly fail.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: 821b8fcdc8383203cb6f6cd3e99a94ec3cfca779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=821b8fcdc8383203cb6f6cd3e… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Jul 28 17:43:08 2010 -0400 urlmon: Fixed a bug that would cause tests to randomly fail. --- dlls/urlmon/uri.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 91d556d..1140e95 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -1790,6 +1790,7 @@ static BOOL canonicalize_host(const parse_data *data, Uri *uri, DWORD flags, BOO uri->host_len = data->host_len; } + uri->host_type = Uri_HOST_UNKNOWN; break; default: WARN("(%p %p %x %d): Canonicalization not supported yet\n", data,

1 0

Nikolay Sivov : shlwapi/tests: Fix some test failures on Win2000.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: b684c60a10c058d5e9d13dfc57d480978b54744d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b684c60a10c058d5e9d13dfc5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 29 09:59:58 2010 +0400 shlwapi/tests: Fix some test failures on Win2000. --- dlls/shlwapi/tests/ordinal.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index d60effd..c3c59c4 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -590,6 +590,7 @@ static void test_GetShellSecurityDescriptor(void) }; SECURITY_DESCRIPTOR* psd; SECURITY_DESCRIPTOR* (WINAPI*pGetShellSecurityDescriptor)(PSHELL_USER_PERMISSION*,int); + void *pChrCmpIW = GetProcAddress(hShlwapi, "ChrCmpIW"); pGetShellSecurityDescriptor=(void*)GetProcAddress(hShlwapi,(char*)475); @@ -599,12 +600,18 @@ static void test_GetShellSecurityDescriptor(void) return; } + if(pChrCmpIW && pChrCmpIW == pGetShellSecurityDescriptor) /* win2k */ + { + win_skip("Skipping for GetShellSecurityDescriptor, same ordinal used for ChrCmpIW\n"); + return; + } + psd = pGetShellSecurityDescriptor(NULL, 2); ok(psd==NULL || broken(psd==INVALID_HANDLE_VALUE), /* IE5 */ "GetShellSecurityDescriptor should fail\n"); psd = pGetShellSecurityDescriptor(rgsup, 0); - ok(psd==NULL, "GetShellSecurityDescriptor should fail\n"); + ok(psd==NULL, "GetShellSecurityDescriptor should fail, got %p\n", psd); SetLastError(0xdeadbeef); psd = pGetShellSecurityDescriptor(rgsup, 2); @@ -614,7 +621,7 @@ static void test_GetShellSecurityDescriptor(void) win_skip("GetShellSecurityDescriptor is not implemented\n"); return; } - if (psd==INVALID_HANDLE_VALUE) + if (psd == INVALID_HANDLE_VALUE) { win_skip("GetShellSecurityDescriptor is broken on IE5\n"); return; @@ -1910,6 +1917,7 @@ static void test_SHGetObjectCompatFlags(void) }; static const char compat_path[] = "Software\\Microsoft\\Windows\\CurrentVersion\\ShellCompatibility\\Objects"; + void *pColorAdjustLuma = GetProcAddress(hShlwapi, "ColorAdjustLuma"); CHAR keyA[39]; /* {CLSID} */ HKEY root; DWORD ret; @@ -1921,6 +1929,12 @@ static void test_SHGetObjectCompatFlags(void) return; } + if (pColorAdjustLuma && pColorAdjustLuma == pSHGetObjectCompatFlags) /* win2k */ + { + win_skip("Skipping SHGetObjectCompatFlags, same ordinal used for ColorAdjustLuma\n"); + return; + } + /* null args */ ret = pSHGetObjectCompatFlags(NULL, NULL); ok(ret == 0, "got %d\n", ret);

1 0

Dylan Smith : richedit: EN_UPDATE notification is sent on WM_PAINT.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: 328a3f1d8c7e254ab003bd22ad52251d8591ed8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=328a3f1d8c7e254ab003bd22a… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jul 28 21:17:13 2010 -0400 richedit: EN_UPDATE notification is sent on WM_PAINT. --- dlls/riched20/editor.c | 2 ++ dlls/riched20/paint.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 14ae16b..7e3dfda 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4421,6 +4421,8 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, PAINTSTRUCT ps; hDC = BeginPaint(editor->hWnd, &ps); + if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE)) + ME_SendOldNotify(editor, EN_UPDATE); /* Erase area outside of the formatting rectangle */ if (ps.rcPaint.top < editor->rcFormat.top) { diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index fc52afb..0a32601 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -129,8 +129,6 @@ void ME_Repaint(ME_TextEditor *editor) ME_UpdateScrollBar(editor); FIXME("ME_Repaint had to call ME_WrapMarkedParagraphs\n"); } - if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE)) - ME_SendOldNotify(editor, EN_UPDATE); ITextHost_TxViewChange(editor->texthost, TRUE); }

1 0

Dylan Smith : richedit: Removed unused run flags values.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: 4c174fc84507ba1641fff263d4feece61ffb2bce URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c174fc84507ba1641fff263d… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jul 28 21:18:03 2010 -0400 richedit: Removed unused run flags values. The only place MERF_SKIPPED was in debug code, and MERF_CALCBYWRAP was only used to clear this unused flag value, so I got rid of both of them. --- dlls/riched20/editstr.h | 4 ---- dlls/riched20/paint.c | 5 +---- dlls/riched20/wrap.c | 3 --- 3 files changed, 1 insertions(+), 11 deletions(-) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index c9c55da..5b5afae 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -118,10 +118,6 @@ typedef enum { #define MERF_ENDWHITE 0x004000 /* run is completely made of whitespaces */ #define MERF_WHITESPACE 0x008000 -/* run is a last (dummy) run in the paragraph */ -#define MERF_SKIPPED 0x010000 -/* flags that are calculated during text wrapping */ -#define MERF_CALCBYWRAP 0x0F0000 /* the "end of paragraph" run, contains 1 character */ #define MERF_ENDPARA 0x100000 /* forcing the "end of row" run, contains 1 character */ diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 5e52e51..2be034b 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -959,10 +959,7 @@ static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) rc.top = c->pt.y + para->pt.y + run->pt.y; rc.bottom = rc.bottom + height; TRACE("rc = (%d, %d, %d, %d)\n", rc.left, rc.top, rc.right, rc.bottom); - if (run->nFlags & MERF_SKIPPED) - DrawFocusRect(c->hDC, &rc); - else - FrameRect(c->hDC, &rc, GetSysColorBrush(COLOR_GRAYTEXT)); + FrameRect(c->hDC, &rc, GetSysColorBrush(COLOR_GRAYTEXT)); } if (visible) ME_DrawRun(c, c->pt.x + run->pt.x, diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index d2ebd94..a7c7fd3 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -349,7 +349,6 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p) return p->next; if (run->nFlags & MERF_WHITESPACE) { - p->member.run.nFlags |= MERF_SKIPPED; wc->pt.x += run->nWidth; /* skip runs consisting of only whitespaces */ return p->next; @@ -362,7 +361,6 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p) if (black) { wc->bOverflown = FALSE; pp = ME_SplitRun(wc, p, black); - p->member.run.nFlags |= MERF_SKIPPED; ME_InsertRowStart(wc, pp); return pp; } @@ -588,7 +586,6 @@ static void ME_PrepareParagraphForWrapping(ME_Context *c, ME_DisplayItem *tp) { else break; } - p->member.run.nFlags &= ~MERF_CALCBYWRAP; break; default: break;

1 0

Thomas Mullaly : urlmon: Implemented canonicalization for ports in URIs.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: 4a88270ce00635348b3dc018d008effc7c8f256a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a88270ce00635348b3dc018d… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Jul 12 16:31:30 2010 -0400 urlmon: Implemented canonicalization for ports in URIs. --- dlls/urlmon/uri.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 86 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index ce27d6d..11c2cfe 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -50,6 +50,9 @@ typedef struct { INT host_start; DWORD host_len; Uri_HOST_TYPE host_type; + + USHORT port; + BOOL has_port; } Uri; typedef struct { @@ -138,6 +141,20 @@ static const struct { {URL_SCHEME_WILDCARD, {'*',0}} }; +/* List of default ports Windows recognizes. */ +static const struct { + URL_SCHEME scheme; + USHORT port; +} default_ports[] = { + {URL_SCHEME_FTP, 21}, + {URL_SCHEME_HTTP, 80}, + {URL_SCHEME_GOPHER, 70}, + {URL_SCHEME_NNTP, 119}, + {URL_SCHEME_TELNET, 23}, + {URL_SCHEME_WAIS, 210}, + {URL_SCHEME_HTTPS, 443}, +}; + static inline BOOL is_alpha(WCHAR val) { return ((val >= 'a' && val <= 'z') || (val >= 'A' && val <= 'Z')); } @@ -1893,6 +1910,72 @@ static BOOL canonicalize_host(const parse_data *data, Uri *uri, DWORD flags, BOO return TRUE; } +static BOOL canonicalize_port(const parse_data *data, Uri *uri, DWORD flags, BOOL computeOnly) { + BOOL has_default_port = FALSE; + USHORT default_port = 0; + DWORD i; + + uri->has_port = FALSE; + + /* Check if the scheme has a default port. */ + for(i = 0; i < sizeof(default_ports)/sizeof(default_ports[0]); ++i) { + if(default_ports[i].scheme == data->scheme_type) { + has_default_port = TRUE; + default_port = default_ports[i].port; + break; + } + } + + if(data->port || has_default_port) + uri->has_port = TRUE; + + /* Possible cases: + * 1) Has a port which is the default port. + * 2) Has a port (not the default). + * 3) Doesn't have a port, but, scheme has a default port. + * 4) No port. + */ + if(has_default_port && data->port && data->port_value == default_port) { + /* If it's the default port and this flag isn't set, don't do anything. */ + if(flags & Uri_CREATE_NO_CANONICALIZE) { + /* Copy the original port over. */ + if(!computeOnly) { + uri->canon_uri[uri->canon_len] = ':'; + memcpy(uri->canon_uri+uri->canon_len+1, data->port, data->port_len*sizeof(WCHAR)); + } + uri->canon_len += data->port_len+1; + } + + uri->port = default_port; + } else if(data->port) { + if(!computeOnly) + uri->canon_uri[uri->canon_len] = ':'; + ++uri->canon_len; + + if(flags & Uri_CREATE_NO_CANONICALIZE) { + /* Copy the original over without changes. */ + if(!computeOnly) + memcpy(uri->canon_uri+uri->canon_len, data->port, data->port_len*sizeof(WCHAR)); + uri->canon_len += data->port_len; + } else { + const WCHAR formatW[] = {'%','u',0}; + INT len = 0; + if(!computeOnly) + len = sprintfW(uri->canon_uri+uri->canon_len, formatW, data->port_value); + else { + WCHAR tmp[6]; + len = sprintfW(tmp, formatW, data->port_value); + } + uri->canon_len += len; + } + + uri->port = data->port_value; + } else if(has_default_port) + uri->port = default_port; + + return TRUE; +} + /* Canonicalizes the authority of the URI represented by the parse_data. */ static BOOL canonicalize_authority(const parse_data *data, Uri *uri, DWORD flags, BOOL computeOnly) { if(!canonicalize_userinfo(data, uri, flags, computeOnly)) @@ -1901,7 +1984,8 @@ static BOOL canonicalize_authority(const parse_data *data, Uri *uri, DWORD flags if(!canonicalize_host(data, uri, flags, computeOnly)) return FALSE; - /* TODO Canonicalize port information. */ + if(!canonicalize_port(data, uri, flags, computeOnly)) + return FALSE; return TRUE; } @@ -2050,7 +2134,7 @@ static HRESULT canonicalize_uri(const parse_data *data, Uri *uri, DWORD flags) { } uri->canon_uri[uri->canon_len] = '\0'; - TRACE("(%p %p %x): finished canonicalizing the URI.\n", data, uri, flags); + TRACE("(%p %p %x): finished canonicalizing the URI. uri=%s\n", data, uri, flags, debugstr_w(uri->canon_uri)); return S_OK; }

1 0

Matt 'Murph' Finnicum : imm32: Set size of OSVERSIONINFOA before calling GetVersionExA.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: 084bf06fe943c8f7dc5eff4b46e4d63270f5a3a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=084bf06fe943c8f7dc5eff4b4… Author: Matt 'Murph' Finnicum <mattfinn(a)gmail.com> Date: Wed Jul 28 14:08:33 2010 -0500 imm32: Set size of OSVERSIONINFOA before calling GetVersionExA. --- dlls/imm32/imm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index c708b83..28f482c 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1769,6 +1769,7 @@ UINT WINAPI ImmGetVirtualKey(HWND hWnd) if ( data ) return data->lastVK; + version.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA); GetVersionExA( &version ); switch(version.dwPlatformId) {

1 0

Alexandre Julliard : winex11: Fix handling of the lpDx array in ExtTextOut for the non-Xrender case.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: b01be941d0b017a9e65ea85f15d0a9e8a5b34060 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b01be941d0b017a9e65ea85f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 28 23:10:49 2010 +0200 winex11: Fix handling of the lpDx array in ExtTextOut for the non-Xrender case. --- dlls/winex11.drv/text.c | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/winex11.drv/text.c b/dlls/winex11.drv/text.c index 7773588..1431bc1 100644 --- a/dlls/winex11.drv/text.c +++ b/dlls/winex11.drv/text.c @@ -62,14 +62,10 @@ X11DRV_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flags, if (pfo->lf.lfEscapement && pfo->lpX11Trans) rotated = TRUE; - TRACE("hdc=%p df=%04x %d,%d %s, %d flags=%d lpDx=%p\n", - physDev->hdc, (UINT16)(physDev->font), x, y, + TRACE("hdc=%p df=%04x %d,%d rc %s %s, %d flags=%d lpDx=%p\n", + physDev->hdc, (UINT16)physDev->font, x, y, wine_dbgstr_rect(lprect), debugstr_wn (wstr, count), count, flags, lpDx); - if (lprect != NULL) TRACE("\trect=(%d,%d - %d,%d)\n", - lprect->left, lprect->top, - lprect->right, lprect->bottom ); - /* Draw the rectangle */ if (flags & ETO_OPAQUE) @@ -126,24 +122,26 @@ X11DRV_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flags, } else { - XTextItem16 *items, *pitem; + XTextItem16 *items; - pitem = items = HeapAlloc( GetProcessHeap(), 0, - count * sizeof(XTextItem16) ); + items = HeapAlloc( GetProcessHeap(), 0, count * sizeof(XTextItem16) ); if(items == NULL) goto FAIL; - for(i = 0; i < count; i++) + items[0].chars = str2b; + items[0].delta = 0; + items[0].nchars = 1; + items[0].font = None; + for(i = 1; i < count; i++) { - pitem->chars = str2b + i; - pitem->delta = lpDx[i]; - pitem->nchars = 1; - pitem->font = None; - pitem++; + items[i].chars = str2b + i; + items[i].delta = (flags & ETO_PDY) ? lpDx[(i - 1) * 2] : lpDx[i - 1]; + items[i].delta -= X11DRV_cptable[pfo->fi->cptable].pTextWidth( pfo, str2b + i - 1, 1 ); + items[i].nchars = 1; + items[i].font = None; } - X11DRV_cptable[pfo->fi->cptable].pDrawText( pfo, gdi_display, physDev->drawable, physDev->gc, - physDev->dc_rect.left + x, physDev->dc_rect.top + y, items, pitem - items ); + physDev->dc_rect.left + x, physDev->dc_rect.top + y, items, count ); HeapFree( GetProcessHeap(), 0, items ); } } @@ -167,7 +165,7 @@ X11DRV_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flags, x_i, y_i, &str2b[i], 1); if (lpDx) { - offset += lpDx[i]; + offset += (flags & ETO_PDY) ? lpDx[i * 2] : lpDx[i]; } else {

1 0

Alexandre Julliard : gdi32/tests: Make function pointers global in the mapping test.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: d100153e5c286ad418ef53ce63860553a3296db2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d100153e5c286ad418ef53ce6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 28 20:34:20 2010 +0200 gdi32/tests: Make function pointers global in the mapping test. --- dlls/gdi32/tests/mapping.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index 7193a0f..7968c2f 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -29,6 +29,11 @@ #include "winuser.h" #include "winerror.h" +static DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); +static DWORD (WINAPI *pGetLayout)(HDC hdc); +static BOOL (WINAPI *pGetTransform)(HDC, DWORD, XFORM *); +static DWORD (WINAPI *pSetVirtualResolution)(HDC, DWORD, DWORD, DWORD, DWORD); + #define rough_match(got, expected) (abs( MulDiv( (got) - (expected), 1000, (expected) )) <= 5) #define expect_LPtoDP(_hdc, _x, _y) \ @@ -221,12 +226,8 @@ static void test_dc_layout(void) { INT ret, size_cx, size_cy, res_x, res_y, dpi_x, dpi_y; SIZE size; - DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); - DWORD (WINAPI *pGetLayout)(HDC hdc); HDC hdc; - pGetLayout = (void *)GetProcAddress(GetModuleHandleA("gdi32.dll"), "GetLayout"); - pSetLayout = (void *)GetProcAddress(GetModuleHandleA("gdi32.dll"), "SetLayout"); if (!pGetLayout || !pSetLayout) { win_skip( "Don't have SetLayout\n" ); @@ -421,14 +422,11 @@ static void test_setvirtualresolution(void) { HDC hdc = CreateICA("DISPLAY", NULL, NULL, NULL); DWORD r; - DWORD (WINAPI *pSetVirtualResolution)(HDC, DWORD, DWORD, DWORD, DWORD); INT horz_res = GetDeviceCaps(hdc, HORZRES); INT horz_size = GetDeviceCaps(hdc, HORZSIZE); INT log_pixels_x = GetDeviceCaps(hdc, LOGPIXELSX); SIZE orig_lometric_vp, orig_lometric_wnd; - pSetVirtualResolution = (void *)GetProcAddress(GetModuleHandleA("gdi32.dll"), "SetVirtualResolution"); - if(!pSetVirtualResolution) { win_skip("Don't have SetVirtualResolution\n"); @@ -533,13 +531,10 @@ static inline void xform_near_match(int line, XFORM *got, XFORM *expect) static void test_gettransform(void) { HDC hdc = CreateICA("DISPLAY", NULL, NULL, NULL); - BOOL (WINAPI *pGetTransform)(HDC, DWORD, XFORM *); XFORM xform, expect; BOOL r; SIZE lometric_vp, lometric_wnd; - pGetTransform = (void *)GetProcAddress(GetModuleHandleA("gdi32.dll"), "GetTransform"); - if(!pGetTransform) { win_skip("Don't have GetTransform\n"); @@ -635,6 +630,12 @@ static void test_gettransform(void) START_TEST(mapping) { + HMODULE mod = GetModuleHandleA("gdi32.dll"); + pGetLayout = (void *)GetProcAddress( mod, "GetLayout" ); + pSetLayout = (void *)GetProcAddress( mod, "SetLayout" ); + pGetTransform = (void *)GetProcAddress( mod, "GetTransform" ); + pSetVirtualResolution = (void *)GetProcAddress( mod, "SetVirtualResolution" ); + test_modify_world_transform(); test_world_transform(); test_dc_layout();

1 0

Paul Vriens : setupapi: Add a stub for SetupDiLoadClassIcon.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: aaf4ce8ac6d70f19b6bce495d1b580acb61c1c69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaf4ce8ac6d70f19b6bce495d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jul 28 16:24:47 2010 +0200 setupapi: Add a stub for SetupDiLoadClassIcon. --- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 6de75b1..1b43bb9 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -363,7 +363,7 @@ @ stdcall SetupDiInstallClassW(long wstr long ptr) @ stub SetupDiInstallDevice @ stub SetupDiInstallDriverFiles -@ stub SetupDiLoadClassIcon +@ stdcall SetupDiLoadClassIcon(ptr ptr ptr) @ stub SetupDiMoveDuplicateDevice @ stdcall SetupDiOpenClassRegKey(ptr long) @ stdcall SetupDiOpenClassRegKeyExA(ptr long long str ptr) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 264a890..a37d689 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -417,3 +417,14 @@ BOOL WINAPI SetupDiDeleteDeviceInfo(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA Dev SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/*********************************************************************** + * SetupDiLoadClassIcon (SETUPAPI.@) + */ +BOOL WINAPI SetupDiLoadClassIcon(const GUID *ClassGuid, HICON *LargeIcon, PINT MiniIconIndex) +{ + FIXME(": stub %s, %p, %p\n", debugstr_guid(ClassGuid), LargeIcon, MiniIconIndex); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

Alexandre Julliard : gdi32/tests: Add some tests for the DC origin in RTL layouts.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: 2773ae181e78363cdc2b0d904da7f013281f0876 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2773ae181e78363cdc2b0d904… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 28 20:35:09 2010 +0200 gdi32/tests: Add some tests for the DC origin in RTL layouts. --- dlls/gdi32/tests/mapping.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index 7968c2f..0b823a7 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -226,6 +226,8 @@ static void test_dc_layout(void) { INT ret, size_cx, size_cy, res_x, res_y, dpi_x, dpi_y; SIZE size; + POINT pt; + HBITMAP bitmap; HDC hdc; if (!pGetLayout || !pSetLayout) @@ -235,6 +237,8 @@ static void test_dc_layout(void) } hdc = CreateCompatibleDC(0); + bitmap = CreateCompatibleBitmap( hdc, 100, 100 ); + SelectObject( hdc, bitmap ); size_cx = GetDeviceCaps(hdc, HORZSIZE); size_cy = GetDeviceCaps(hdc, VERTSIZE); @@ -263,7 +267,25 @@ static void test_dc_layout(void) expect_viewport_ext(hdc, 1, 1); expect_window_ext(hdc, 1, 1); expect_world_transform(hdc, 1.0, 1.0); - expect_LPtoDP(hdc, -1000, 1000); + expect_LPtoDP(hdc, -1000 + 99, 1000); + GetViewportOrgEx( hdc, &pt ); + ok( pt.x == 0 && pt.y == 0, "wrong origin %d,%d\n", pt.x, pt.y ); + GetWindowOrgEx( hdc, &pt ); + ok( pt.x == 0 && pt.y == 0, "wrong origin %d,%d\n", pt.x, pt.y ); + GetDCOrgEx( hdc, &pt ); + ok( pt.x == 0 && pt.y == 0, "wrong origin %d,%d\n", pt.x, pt.y ); + if (pGetTransform) + { + XFORM xform; + BOOL ret = pGetTransform( hdc, 0x204, &xform ); /* World -> Device */ + ok( ret, "got %d\n", ret ); + ok( xform.eM11 == -1.0, "got %f\n", xform.eM11 ); + ok( xform.eM12 == 0.0, "got %f\n", xform.eM12 ); + ok( xform.eM21 == 0.0, "got %f\n", xform.eM21 ); + ok( xform.eM22 == 1.0, "got %f\n", xform.eM22 ); + ok( xform.eDx == 99.0, "got %f\n", xform.eDx ); + ok( xform.eDy == 0.0, "got %f\n", xform.eDy ); + } SetMapMode(hdc, MM_LOMETRIC); ret = GetMapMode( hdc ); @@ -278,7 +300,7 @@ static void test_dc_layout(void) rough_match( size.cy, MulDiv( res_y, 254, dpi_y )), /* Vista uses a more precise method */ "expected cy %d or %d, got %d\n", size_cy * 10, MulDiv( res_y, 254, dpi_y ), size.cy ); expect_world_transform(hdc, 1.0, 1.0); - expect_LPtoDP(hdc, -MulDiv(1000 / 10, res_x, size_cx), -MulDiv(1000 / 10, res_y, size_cy)); + expect_LPtoDP(hdc, -MulDiv(1000 / 10, res_x, size_cx) + 99, -MulDiv(1000 / 10, res_y, size_cy)); SetMapMode(hdc, MM_TEXT); ret = GetMapMode( hdc ); @@ -291,6 +313,7 @@ static void test_dc_layout(void) ok(ret == MM_TEXT, "expected MM_TEXT, got %d\n", ret); DeleteDC(hdc); + DeleteObject( bitmap ); } static void test_modify_world_transform(void)

1 0