April 2009 - Wine-Commits - list.winehq.org

Igor Tarasov : comctl32: Fix regression caused by 2d751ee56afced908d0788b936fa4aac1b29f1a1.
by Alexandre Julliard April 20, 2009

April 20, 2009

Module: wine Branch: master Commit: c037b333c889729b5c1dd5150fdc6310d676cd62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c037b333c889729b5c1dd5150… Author: Igor Tarasov <tarasov.igor(a)gmail.com> Date: Sat Apr 18 06:51:40 2009 +0500 comctl32: Fix regression caused by 2d751ee56afced908d0788b936fa4aac1b29f1a1. Fixing regression produced by "comctl32: Correct handling of toolbar separators size". As it came out, some applications DO rely on iBitmap value, but it can be received not with TB_GETBUTTONINFO, but with TB_GETBITMAP. --- dlls/comctl32/toolbar.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index fe4c539..faac97c 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -1331,7 +1331,7 @@ TOOLBAR_WrapToolbar( HWND hwnd, DWORD dwStyle ) /* horizontal separators are treated as buttons for width */ else if ((btnPtr[i].fsStyle & BTNS_SEP) && !(infoPtr->dwStyle & CCS_VERT)) - cx = SEPARATOR_WIDTH; + cx = (btnPtr[i].iBitmap > 0) ? btnPtr[i].iBitmap : SEPARATOR_WIDTH; else cx = infoPtr->nButtonWidth; @@ -1683,11 +1683,12 @@ TOOLBAR_LayoutToolbar(HWND hwnd) if (btnPtr->fsStyle & BTNS_SEP) { if (infoPtr->dwStyle & CCS_VERT) { - cy = SEPARATOR_WIDTH; - cx = (btnPtr->cx > 0) ? btnPtr->cx : infoPtr->nButtonWidth; + cy = (btnPtr->iBitmap > 0) ? btnPtr->iBitmap : SEPARATOR_WIDTH; + cx = (btnPtr->cx > 0) ? btnPtr->cx : infoPtr->nWidth; } else - cx = (btnPtr->cx > 0) ? btnPtr->cx : SEPARATOR_WIDTH; + cx = (btnPtr->cx > 0) ? btnPtr->cx : + (btnPtr->iBitmap > 0) ? btnPtr->iBitmap : SEPARATOR_WIDTH; } else { @@ -1835,11 +1836,7 @@ TOOLBAR_InternalInsertButtonsT(TOOLBAR_INFO *infoPtr, INT iIndex, UINT nAddButto ZeroMemory(btnPtr, sizeof(*btnPtr)); - /* When inserting separator, iBitmap controls it's size */ - if (lpTbb[iButton].fsStyle & BTNS_SEP) { - btnPtr->cx = lpTbb[iButton].iBitmap; - } else - btnPtr->iBitmap = lpTbb[iButton].iBitmap; + btnPtr->iBitmap = lpTbb[iButton].iBitmap; btnPtr->idCommand = lpTbb[iButton].idCommand; btnPtr->fsState = lpTbb[iButton].fsState; btnPtr->fsStyle = lpTbb[iButton].fsStyle;

1 0

Huw Davies : winex11.drv: Fix typo so that emf -> mfpict synthesis works.
by Alexandre Julliard April 20, 2009

April 20, 2009

Module: wine Branch: master Commit: 0b6d74c4282eeef61ae4b4e1be8db2cd919be5c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b6d74c4282eeef61ae4b4e1b… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 17 14:49:29 2009 +0100 winex11.drv: Fix typo so that emf -> mfpict synthesis works. --- dlls/user32/tests/clipboard.c | 5 ++--- dlls/winex11.drv/clipboard.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 41561a4..51aa852 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -247,10 +247,9 @@ static void test_synthesized(void) ok(cf == CF_UNICODETEXT, "cf %08x\n", cf); cf = EnumClipboardFormats(cf); - todo_wine ok(cf == CF_METAFILEPICT, "cf %08x\n", cf); - if(cf == CF_METAFILEPICT) - cf = EnumClipboardFormats(cf); + ok(cf == CF_METAFILEPICT, "cf %08x\n", cf); + cf = EnumClipboardFormats(cf); ok(cf == 0, "cf %08x\n", cf); r = EmptyClipboard(); diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 07d58a5..e7f4667 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2746,7 +2746,7 @@ static BOOL X11DRV_CLIPBOARD_SynthesizeData(UINT wFormatID) } else if (wFormatID == CF_METAFILEPICT) { - bsyn = (lpSource = X11DRV_CLIPBOARD_LookupData(CF_METAFILEPICT)) && + bsyn = (lpSource = X11DRV_CLIPBOARD_LookupData(CF_ENHMETAFILE)) && ~lpSource->wFlags & CF_FLAG_SYNTHESIZED; } else if (wFormatID == CF_DIB)

1 0

Henri Verbeet : wined3d: Store the source relative addressing token as a struct wined3d_shader_src_param .
by Alexandre Julliard April 20, 2009

April 20, 2009

Module: wine Branch: master Commit: 0663eb932326b1b9767296c3f80ac58959de6b97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0663eb932326b1b9767296c3f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 17 09:46:56 2009 +0200 wined3d: Store the source relative addressing token as a struct wined3d_shader_src_param. --- dlls/wined3d/baseshader.c | 20 ++++- dlls/wined3d/glsl_shader.c | 168 ++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 100 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0663eb932326b1b976729…

1 0

Paul Vriens : gdi32/tests: Skip several tests on Win9x.
by Alexandre Julliard April 20, 2009

April 20, 2009

Module: wine Branch: master Commit: 59cc56b15a544ecc010a7ee799d0fe01f49e1754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59cc56b15a544ecc010a7ee79… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Apr 17 15:43:24 2009 +0200 gdi32/tests: Skip several tests on Win9x. --- dlls/gdi32/tests/pen.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index f53dac4..460288d 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -91,6 +91,14 @@ static void test_logpen(void) size = GetObject(hpen, sizeof(lp), &lp); ok(size == sizeof(lp), "GetObject returned %d, error %d\n", size, GetLastError()); + if (pen[i].style == PS_USERSTYLE || pen[i].style == PS_ALTERNATE) + { + if (lp.lopnStyle == pen[i].style) + { + win_skip("Skipping PS_USERSTYLE and PS_ALTERNATE tests on Win9x\n"); + continue; + } + } ok(lp.lopnStyle == pen[i].ret_style, "expected %u, got %u\n", pen[i].ret_style, lp.lopnStyle); ok(lp.lopnWidth.x == pen[i].ret_width, "expected %u, got %d\n", pen[i].ret_width, lp.lopnWidth.x); ok(lp.lopnWidth.y == 0 || @@ -521,6 +529,11 @@ static void test_ps_userstyle(void) pen = ExtCreatePen(PS_GEOMETRIC | PS_USERSTYLE, 50, &lb, 3, NULL); ok(pen == 0, "ExtCreatePen should fail\n"); + if (pen == 0 && GetLastError() == 0xdeadbeef) + { + win_skip("Looks like 9x, skipping PS_USERSTYLE tests\n"); + return; + } expect(ERROR_INVALID_PARAMETER, GetLastError()); DeleteObject(pen); SetLastError(0xdeadbeef);

1 0

Frans Kool : crypt32: Corrected Dutch translations.
by Alexandre Julliard April 20, 2009

April 20, 2009

Module: wine Branch: master Commit: 88f981658bb6a1ae276cdb04b7dc63bfbeabad90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88f981658bb6a1ae276cdb04b… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Thu Apr 16 09:26:25 2009 +0200 crypt32: Corrected Dutch translations. --- dlls/crypt32/crypt32_Nl.rc | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/crypt32_Nl.rc b/dlls/crypt32/crypt32_Nl.rc index fe3fa45..70ea2ba 100644 --- a/dlls/crypt32/crypt32_Nl.rc +++ b/dlls/crypt32/crypt32_Nl.rc @@ -43,7 +43,7 @@ STRINGTABLE DISCARDABLE IDS_CONTENT_TYPE "Inhoud Type" IDS_MESSAGE_DIGEST "Boodschap Samenvatting" IDS_SIGNING_TIME "Tijd van Ondertekening" - IDS_COUNTER_SIGN "Counter Sign" + IDS_COUNTER_SIGN "Tegen handtekening" IDS_CHALLENGE_PASSWORD "Geheime Vraag Wachtwoord" IDS_UNSTRUCTURED_ADDRESS "Ongestructureerd Adres" IDS_SMIME_CAPABILITIES "SMIME Mogelijkheden" @@ -63,9 +63,9 @@ STRINGTABLE DISCARDABLE IDS_NETSCAPE_CA_POLICY_URL "Netscape CA Beleids URL" IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL Server Naam" IDS_NETSCAPE_COMMENT "Netscape Commentaar" - IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" - IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" - IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" + IDS_SPC_SP_AGENCY_INFO "SPC SP Agency Informatie" + IDS_SPC_FINANCIAL_CRITERIA "SPC Financiele Criteria" + IDS_SPC_MINIMAL_CRITERIA "SPC Minimale Criteria" IDS_COUNTRY "Land/Regio" IDS_ORGANIZATION "Organisatie" IDS_ORGANIZATIONAL_UNIT "Organisatie Onderdeel" @@ -173,6 +173,7 @@ STRINGTABLE DISCARDABLE IDS_LOCALIZEDNAME_ADDRESSBOOK "Overige Personen" IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "Vertrouwde uitgevers" } + STRINGTABLE DISCARDABLE { IDS_KEY_ID "SleutelID=" @@ -181,7 +182,7 @@ STRINGTABLE DISCARDABLE IDS_ALT_NAME_OTHER_NAME "Andere naam=" IDS_ALT_NAME_RFC822_NAME "Email Adres=" IDS_ALT_NAME_DNS_NAME "DNS naam=" - IDS_ALT_NAME_DIRECTORY_NAME "Directory adres" + IDS_ALT_NAME_DIRECTORY_NAME "Directory naam=" IDS_ALT_NAME_URL "URL=" IDS_ALT_NAME_IP_ADDRESS "IP adres=" IDS_ALT_NAME_MASK "Masker=" @@ -205,8 +206,8 @@ STRINGTABLE DISCARDABLE IDS_CRL_DIST_POINT_RDN_NAME "RDN naam" IDS_CRL_DIST_POINT_REASON "CRL reden=" IDS_CRL_DIST_POINT_ISSUER "CRL verstrekker" - IDS_REASON_KEY_COMPROMISE "Key Compromie" - IDS_REASON_CA_COMPROMISE "CA Compromie" + IDS_REASON_KEY_COMPROMISE "Sleutel besmet" + IDS_REASON_CA_COMPROMISE "CA besmet" IDS_REASON_AFFILIATION_CHANGED "Samenwerking gewijzigd" IDS_REASON_SUPERSEDED "Verouderd" IDS_REASON_CESSATION_OF_OPERATION "Werkzaamheden gestaakt"

1 0

Michael Stefaniuc : ws2_32: Use better types for some variables.
by Alexandre Julliard April 20, 2009

April 20, 2009

Module: wine Branch: master Commit: 0847e7d826567aa3a8502fa6c4913d1343d37cf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0847e7d826567aa3a8502fa6c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Apr 17 10:35:21 2009 +0200 ws2_32: Use better types for some variables. --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index cabe191..0031ad2 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2382,7 +2382,7 @@ INT WINAPI WSAIoctl(SOCKET s, int WINAPI WS_ioctlsocket(SOCKET s, LONG cmd, WS_u_long *argp) { int fd; - long newcmd = cmd; + LONG newcmd = cmd; TRACE("socket %04lx, cmd %08x, ptr %p\n", s, cmd, argp); /* broken apps like defcon pass the argp value directly instead of a pointer to it */ diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ffc7ba9..c46a3f1 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1996,8 +1996,8 @@ static void test_ioctlsocket(void) { SOCKET sock; int ret; - long cmds[] = {FIONBIO, FIONREAD, SIOCATMARK}; - int i; + static const LONG cmds[] = {FIONBIO, FIONREAD, SIOCATMARK}; + UINT i; sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ok(sock != INVALID_SOCKET, "Creating the socket failed: %d\n", WSAGetLastError()); @@ -2007,7 +2007,7 @@ static void test_ioctlsocket(void) return; } - for(i = 0; i < sizeof(cmds)/sizeof(long); i++) + for(i = 0; i < sizeof(cmds)/sizeof(cmds[0]); i++) { /* broken apps like defcon pass the argp value directly instead of a pointer to it */ ret = ioctlsocket(sock, cmds[i], (u_long *)1);

1 0

Michael Stefaniuc : msi: Remove superfluous cast of a MSIHANDLE in a TRACE( ).
by Alexandre Julliard April 20, 2009

April 20, 2009

Module: wine Branch: master Commit: f3a1660181bb75de2b38c839e9d68f4ec5665c13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3a1660181bb75de2b38c839e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Apr 17 10:34:47 2009 +0200 msi: Remove superfluous cast of a MSIHANDLE in a TRACE(). --- dlls/msi/automation.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 6668b17..b443257 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -162,7 +162,7 @@ static HRESULT create_automation_object(MSIHANDLE msiHandle, IUnknown *pUnkOuter AutomationObject *object; HRESULT hr; - TRACE("(%ld,%p,%p,%s,%p,%p,%ld)\n", (unsigned long)msiHandle, pUnkOuter, ppObj, debugstr_guid(clsid), funcInvoke, funcFree, sizetPrivateData); + TRACE("(%d,%p,%p,%s,%p,%p,%ld)\n", msiHandle, pUnkOuter, ppObj, debugstr_guid(clsid), funcInvoke, funcFree, sizetPrivateData); if( pUnkOuter ) return CLASS_E_NOAGGREGATION;

1 0

Michael Stefaniuc : msi/tests: Replace long with LONG.
by Alexandre Julliard April 20, 2009

April 20, 2009

Module: wine Branch: master Commit: cf6ec333a5fd3f2169b8b2e1b6ab889830cd4a1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf6ec333a5fd3f2169b8b2e1b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Apr 17 10:34:58 2009 +0200 msi/tests: Replace long with LONG. --- dlls/msi/tests/automation.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index f9ab254..7229748 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1046,7 +1046,7 @@ static HRESULT Session_EvaluateCondition(IDispatch *pSession, LPCWSTR szConditio return hr; } -static HRESULT Session_Message(IDispatch *pSession, long kind, IDispatch *record, int *ret) +static HRESULT Session_Message(IDispatch *pSession, LONG kind, IDispatch *record, int *ret) { VARIANT varresult; VARIANTARG vararg[2]; @@ -1067,7 +1067,7 @@ static HRESULT Session_Message(IDispatch *pSession, long kind, IDispatch *record return hr; } -static HRESULT Session_SetInstallLevel(IDispatch *pSession, long iInstallLevel) +static HRESULT Session_SetInstallLevel(IDispatch *pSession, LONG iInstallLevel) { VARIANT varresult; VARIANTARG vararg[1];

1 0

Michael Stefaniuc : riched20/tests: Use better types than long.
by Alexandre Julliard April 20, 2009

April 20, 2009

Module: wine Branch: master Commit: b747284797bdf1d48659eaaceac8bfef53ed678a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b747284797bdf1d48659eaace… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Apr 17 10:34:37 2009 +0200 riched20/tests: Use better types than long. --- dlls/riched20/tests/editor.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 78a9541..1b9e244 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -445,7 +445,7 @@ static int get_scroll_pos_y(HWND hwnd) return p.y; } -static void move_cursor(HWND hwnd, long charindex) +static void move_cursor(HWND hwnd, LONG charindex) { CHARRANGE cr; cr.cpMax = charindex; @@ -4211,9 +4211,9 @@ static void test_EM_GETMODIFY(void) } struct exsetsel_s { - long min; - long max; - long expected_retval; + LONG min; + LONG max; + LRESULT expected_retval; int expected_getsel_start; int expected_getsel_end; int _getsel_todo_wine;

1 0

Huw Davies : wineps.drv: Fix compile error.
by Alexandre Julliard April 20, 2009

April 20, 2009

Module: wine Branch: master Commit: e911fde41cbcbfe0bf2bc8fea5631abe174cc2c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e911fde41cbcbfe0bf2bc8fea… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 16 22:05:30 2009 +0100 wineps.drv: Fix compile error. --- dlls/wineps.drv/mkagl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/mkagl.c b/dlls/wineps.drv/mkagl.c index d6aab8a..0cdb605 100644 --- a/dlls/wineps.drv/mkagl.c +++ b/dlls/wineps.drv/mkagl.c @@ -518,7 +518,7 @@ int main(int argc, char *argv[]) /* Clean up */ fclose(f_c); - fclose(f_h; + fclose(f_h); return 0; }

1 0