February 2010 - Wine-Commits

Huw Davies : oleaut32: Realize the font in getter functions.
by Alexandre Julliard Feb. 2, 2010

Feb. 2, 2010

Module: wine Branch: master Commit: cf602ca4228f954d7de3b8100cea8fad680ed7f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf602ca4228f954d7de3b8100… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 2 10:15:39 2010 +0000 oleaut32: Realize the font in getter functions. --- dlls/oleaut32/olefont.c | 134 +++++++++++++++++++++++++---------------- dlls/oleaut32/tests/olefont.c | 2 - 2 files changed, 83 insertions(+), 53 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index 9309b0f..c0d9b66 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -111,6 +111,22 @@ static HFONTItem *find_hfontitem(HFONT hfont) return NULL; } +/* Add an item to the list with one internal reference */ +static HRESULT add_hfontitem(HFONT hfont) +{ + HFONTItem *new_item = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_item)); + + if(!new_item) return E_OUTOFMEMORY; + + new_item->int_refs = 1; + new_item->total_refs = 1; + new_item->gdiFont = hfont; + EnterCriticalSection(&OLEFontImpl_csHFONTLIST); + list_add_tail(&OLEFontImpl_hFontList,&new_item->entry); + LeaveCriticalSection(&OLEFontImpl_csHFONTLIST); + return S_OK; +} + static HRESULT inc_int_ref(HFONT hfont) { HFONTItem *item; @@ -221,7 +237,7 @@ struct OLEFontImpl * Contain the font associated with this object. */ HFONT gdiFont; - + BOOL dirty; /* * Size ratio */ @@ -370,8 +386,8 @@ static void OLEFont_SendNotify(OLEFontImpl* this, DISPID dispID) CONNECTDATA CD; HRESULT hres; - dec_int_ref(this->gdiFont); - this->gdiFont = 0; + this->dirty = TRUE; + hres = IConnectionPoint_EnumConnections(this->pPropertyNotifyCP, &pEnum); if (SUCCEEDED(hres)) { @@ -526,6 +542,52 @@ static ULONG WINAPI OLEFontImpl_Release( return ret; } +static void realize_font(OLEFontImpl *This) +{ + if (This->dirty) + { + LOGFONTW logFont; + INT fontHeight; + + if(This->gdiFont) + { + dec_int_ref(This->gdiFont); + This->gdiFont = 0; + } + + /* + * The height of the font returned by the get_Size property is the + * height of the font in points multiplied by 10000... Using some + * simple conversions and the ratio given by the application, it can + * be converted to a height in pixels. + */ + + /* Standard ratio is 72 / 2540, or 18 / 635 in lowest terms. */ + /* Ratio is applied here relative to the standard. */ + fontHeight = MulDiv( This->description.cySize.s.Lo, This->cyLogical*635, This->cyHimetric*18 ); + + memset(&logFont, 0, sizeof(LOGFONTW)); + + logFont.lfHeight = ((fontHeight%10000L)>5000L) ? (-fontHeight/10000L) - 1 : + (-fontHeight/10000L); + logFont.lfItalic = This->description.fItalic; + logFont.lfUnderline = This->description.fUnderline; + logFont.lfStrikeOut = This->description.fStrikethrough; + logFont.lfWeight = This->description.sWeight; + logFont.lfCharSet = This->description.sCharset; + logFont.lfOutPrecision = OUT_CHARACTER_PRECIS; + logFont.lfClipPrecision = CLIP_DEFAULT_PRECIS; + logFont.lfQuality = DEFAULT_QUALITY; + logFont.lfPitchAndFamily = DEFAULT_PITCH; + lstrcpynW(logFont.lfFaceName, This->description.lpstrName, LF_FACESIZE); + + This->gdiFont = CreateFontIndirectW(&logFont); + This->dirty = FALSE; + + add_hfontitem(This->gdiFont); + } +} + /************************************************************************ * OLEFontImpl_get_Name (IFont) * @@ -543,6 +605,8 @@ static HRESULT WINAPI OLEFontImpl_get_Name( if (pname==0) return E_POINTER; + if(this->dirty) realize_font(this); + if (this->description.lpstrName!=0) *pname = SysAllocString(this->description.lpstrName); else @@ -607,6 +671,8 @@ static HRESULT WINAPI OLEFontImpl_get_Size( if (psize==0) return E_POINTER; + if(this->dirty) realize_font(this); + psize->s.Hi = 0; psize->s.Lo = this->description.cySize.s.Lo; @@ -648,6 +714,8 @@ static HRESULT WINAPI OLEFontImpl_get_Bold( if (pbold==0) return E_POINTER; + if(this->dirty) realize_font(this); + *pbold = this->description.sWeight > 550; return S_OK; @@ -687,6 +755,8 @@ static HRESULT WINAPI OLEFontImpl_get_Italic( if (pitalic==0) return E_POINTER; + if(this->dirty) realize_font(this); + *pitalic = this->description.fItalic; return S_OK; @@ -728,6 +798,8 @@ static HRESULT WINAPI OLEFontImpl_get_Underline( if (punderline==0) return E_POINTER; + if(this->dirty) realize_font(this); + *punderline = this->description.fUnderline; return S_OK; @@ -769,6 +841,8 @@ static HRESULT WINAPI OLEFontImpl_get_Strikethrough( if (pstrikethrough==0) return E_POINTER; + if(this->dirty) realize_font(this); + *pstrikethrough = this->description.fStrikethrough; return S_OK; @@ -810,6 +884,8 @@ static HRESULT WINAPI OLEFontImpl_get_Weight( if (pweight==0) return E_POINTER; + if(this->dirty) realize_font(this); + *pweight = this->description.sWeight; return S_OK; @@ -851,6 +927,8 @@ static HRESULT WINAPI OLEFontImpl_get_Charset( if (pcharset==0) return E_POINTER; + if(this->dirty) realize_font(this); + *pcharset = this->description.sCharset; return S_OK; @@ -888,54 +966,7 @@ static HRESULT WINAPI OLEFontImpl_get_hFont( if (phfont==NULL) return E_POINTER; - /* - * Realize the font if necessary - */ - if (this->gdiFont==0) -{ - LOGFONTW logFont; - INT fontHeight; - CY cySize; - PHFONTItem newEntry; - - /* - * The height of the font returned by the get_Size property is the - * height of the font in points multiplied by 10000... Using some - * simple conversions and the ratio given by the application, it can - * be converted to a height in pixels. - */ - IFont_get_Size(iface, &cySize); - - /* Standard ratio is 72 / 2540, or 18 / 635 in lowest terms. */ - /* Ratio is applied here relative to the standard. */ - fontHeight = MulDiv( cySize.s.Lo, this->cyLogical*635, this->cyHimetric*18 ); - - memset(&logFont, 0, sizeof(LOGFONTW)); - - logFont.lfHeight = ((fontHeight%10000L)>5000L) ? (-fontHeight/10000L)-1 : - (-fontHeight/10000L); - logFont.lfItalic = this->description.fItalic; - logFont.lfUnderline = this->description.fUnderline; - logFont.lfStrikeOut = this->description.fStrikethrough; - logFont.lfWeight = this->description.sWeight; - logFont.lfCharSet = this->description.sCharset; - logFont.lfOutPrecision = OUT_CHARACTER_PRECIS; - logFont.lfClipPrecision = CLIP_DEFAULT_PRECIS; - logFont.lfQuality = DEFAULT_QUALITY; - logFont.lfPitchAndFamily = DEFAULT_PITCH; - strcpyW(logFont.lfFaceName,this->description.lpstrName); - - this->gdiFont = CreateFontIndirectW(&logFont); - - /* Add font to the cache */ - newEntry = HeapAlloc(GetProcessHeap(), 0, sizeof(HFONTItem)); - newEntry->int_refs = 1; - newEntry->total_refs = 1; - newEntry->gdiFont = this->gdiFont; - EnterCriticalSection(&OLEFontImpl_csHFONTLIST); - list_add_tail(&OLEFontImpl_hFontList,&newEntry->entry); - LeaveCriticalSection(&OLEFontImpl_csHFONTLIST); - } + if(this->dirty) realize_font(this); *phfont = this->gdiFont; TRACE("Returning %p\n", *phfont); @@ -2286,6 +2317,7 @@ static OLEFontImpl* OLEFontImpl_Construct(const FONTDESC *fontDesc) * Initializing all the other members. */ newObject->gdiFont = 0; + newObject->dirty = TRUE; newObject->cyLogical = 72L; newObject->cyHimetric = 2540L; newObject->pPropertyNotifyCP = NULL; diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 906eeb4..79dbade 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -877,7 +877,6 @@ static void test_hfont_lifetime(void) /* put_Size doesn't cause the new font to be realized */ obj_type = GetObjectType(last_hfont); -todo_wine ok(obj_type == OBJ_FONT, "got obj type %d\n", obj_type); hr = IFont_get_hFont(font, &hfont); @@ -939,7 +938,6 @@ todo_wine /* put_Size doesn't cause the new font to be realized */ obj_type = GetObjectType(last_hfont); -todo_wine ok(obj_type == OBJ_FONT, "got obj type %d\n", obj_type); hr = IFont_get_hFont(font, &hfont);

1 0

Alexandre Julliard : user32/tests: Dispatch a message in case we can a WM_PAINT.
by Alexandre Julliard Feb. 2, 2010

Feb. 2, 2010

Module: wine Branch: master Commit: c4568edd64a321adf33cfac9ce1ce33f4fe9b049 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4568edd64a321adf33cfac9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 2 11:24:46 2010 +0100 user32/tests: Dispatch a message in case we can a WM_PAINT. --- dlls/user32/tests/win.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 6fb6ce0..c92b3ed 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2980,6 +2980,7 @@ static void test_mouse_input(HWND hwnd) if (msg.message == WM_TIMER || ignore_message(msg.message)) continue; ok(msg.hwnd == popup && msg.message == WM_MOUSEMOVE, "hwnd %p message %04x\n", msg.hwnd, msg.message); + DispatchMessage(&msg); } ret = peek_message(&msg); ok( !ret, "message %04x available\n", msg.message);

1 0

Jörg Höhle : winmm: Reset MIDIHDR flags prior to return from midiStreamOut.
by Alexandre Julliard Feb. 2, 2010

Feb. 2, 2010

Module: wine Branch: master Commit: bc76916b906100581e9e42f8a06ab34e8410d13a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc76916b906100581e9e42f8a… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Feb 2 08:37:09 2010 +0100 winmm: Reset MIDIHDR flags prior to return from midiStreamOut. --- dlls/winmm/winmm.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 6205466..3fee0a8 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1833,7 +1833,8 @@ MMRESULT WINAPI midiStreamOut(HMIDISTRM hMidiStrm, LPMIDIHDR lpMidiHdr, if (!MMSYSTEM_GetMidiStream(hMidiStrm, &lpMidiStrm, NULL)) { ret = MMSYSERR_INVALHANDLE; } else { - lpMidiHdr->dwFlags |= MHDR_ISSTRM; + lpMidiHdr->dwFlags |= MHDR_ISSTRM | MHDR_INQUEUE; + lpMidiHdr->dwFlags &= ~MHDR_DONE; if (!PostThreadMessageA(lpMidiStrm->dwThreadID, WINE_MSM_HEADER, cbMidiHdr, (LPARAM)lpMidiHdr)) {

1 0

André Hentschel : oleaut32: Rewrite RollUdate to be easier to change and to support more conversions.
by Alexandre Julliard Feb. 2, 2010

Feb. 2, 2010

Module: wine Branch: master Commit: 1b51c21fb30ee3fa4366d3628d343361e1696ef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b51c21fb30ee3fa4366d3628… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Feb 1 21:26:44 2010 +0100 oleaut32: Rewrite RollUdate to be easier to change and to support more conversions. --- dlls/oleaut32/tests/vartest.c | 30 ++++++++++----- dlls/oleaut32/variant.c | 81 +++++++++++++++++++++++++++-------------- 2 files changed, 74 insertions(+), 37 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 8d7cf11..377a847 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1639,26 +1639,36 @@ static void test_VarDateFromUdate(void) CHECKPTR(VarDateFromUdate); UD2T(1,1,1980,0,0,0,0,2,1,0,S_OK,29221.0); /* 1 Jan 1980 */ UD2T(2,1,1980,0,0,0,0,3,2,0,S_OK,29222.0); /* 2 Jan 1980 */ + UD2T(2,1,1980,0,0,0,0,4,5,0,S_OK,29222.0); /* 2 Jan 1980 */ UD2T(31,12,1990,0,0,0,0,0,0,0,S_OK,33238.0); /* 31 Dec 1990 */ UD2T(31,12,90,0,0,0,0,0,0,0,S_OK,33238.0); /* year < 100 is 1900+year! */ UD2T(30,12,1899,0,0,0,0,6,364,0,S_OK,0.0); /* 30 Dec 1899 - VT_DATE 0.0 */ UD2T(1,1,100,0,0,0,0,0,0,0,S_OK,-657434.0); /* 1 Jan 100 - Min */ UD2T(31,12,9999,0,0,0,0,0,0,0,S_OK,2958465.0); /* 31 Dec 9999 - Max */ UD2T(1,1,10000,0,0,0,0,0,0,0,E_INVALIDARG,0.0); /* > 31 Dec 9999 => err */ + UD2T(1,1,-10000,0,0,0,0,0,0,0,E_INVALIDARG,0.0);/* < -9999 => err */ UD2T(30,12,1899,0,0,0,0,0,0,0,S_OK,0.0); /* 30 Dec 1899 0:00:00 */ UD2T(30,12,1899,0,0,0,999,0,0,0,S_OK,0.0); /* Ignore milliseconds */ - UD2T(1,1,1980,18,1,16,0,2,1,0,S_OK,29221.75087962963); /* 6:18:02 PM */ - todo_wine UD2T(0,1,1980,42,1,16,0,2,1,0,S_OK,29221.75087962963); /* Test rolled hours */ - todo_wine UD2T(1,1,1980,17,61,16,0,2,1,0,S_OK,29221.75087962963); /* Test rolled minutes */ - todo_wine UD2T(1,1,1980,18,0,76,0,2,1,0,S_OK,29221.75087962963); /* Test rolled seconds */ - todo_wine UD2T(2,1,1980,-6,1,16,0,2,1,0,S_OK,29221.75087962963); /* Test backrolled hours */ - todo_wine UD2T(1,1,1980,19,-59,16,0,2,1,0,S_OK,29221.75087962963); /* Test backrolled minutes */ - todo_wine UD2T(1,1,1980,18,2,-44,0,2,1,0,S_OK,29221.75087962963); /* Test backrolled seconds */ - - UD2T(0,1,1980,0,0,0,0,2,1,0,S_OK,29220.0); /* Rolls back to 31 Dec 1899 */ - UD2T(1,13,1980,0,0,0,0,2,1,0,S_OK,29587.0); /* Rolls fwd to 1/1/1981 */ + UD2T(1,1,1980,18,1,16,0,2,1,0,S_OK,29221.75087962963); /* 6:18:02 PM */ + UD2T(0,1,1980,42,1,16,0,2,1,0,S_OK,29221.75087962963); /* Test fwdrolled hours */ + UD2T(1,1,1980,17,61,16,0,2,1,0,S_OK,29221.75087962963); /* Test fwdrolled minutes */ + UD2T(1,1,1980,18,0,76,0,2,1,0,S_OK,29221.75087962963); /* Test fwdrolled seconds */ + UD2T(3,1,1980,-30,1,16,0,2,1,0,S_OK,29221.75087962963); /* Test backrolled hours */ + UD2T(1,1,1980,20,-119,16,0,2,1,0,S_OK,29221.75087962963); /* Test backrolled minutes */ + UD2T(1,1,1980,18,3,-104,0,2,1,0,S_OK,29221.75087962963); /* Test backrolled seconds */ + UD2T(1,12001,-1020,18,1,16,0,0,0,0,S_OK,29221.75087962963); /* Test rolled year and month */ + UD2T(1,-23,1982,18,1,16,0,0,0,0,S_OK,29221.75087962963); /* Test backrolled month */ + todo_wine UD2T(-59,3,1980,18,1,16,0,0,0,0,S_OK,29221.75087962963); /* Test backrolled days */ + todo_wine UD2T(1,1,0,0,0,0,0,0,0,0,S_OK,36526); /* Test zero year */ + + UD2T(0,0,1980,0,0,0,0,0,0,0,S_OK,29189); /* Test zero day and month */ + UD2T(0,1,1980,0,0,0,0,2,1,0,S_OK,29220.0); /* Test zero day = LastDayOfMonth */ + UD2T(-1,1,1980,18,1,16,0,0,0,0,S_OK,29219.75087962963); /* Test day -1 = LastDayOfMonth - 1 */ + UD2T(1,1,-1,18,1,16,0,0,0,0,S_OK,36161.75087962963); /* Test year -1 = 1999 */ + UD2T(1,-1,1980,18,1,16,0,0,0,0,S_OK,29160.7508796296); /* Test month -1 = 11 */ + UD2T(1,13,1980,0,0,0,0,2,1,0,S_OK,29587.0); /* Rolls fwd to 1/1/1981 */ } static void test_st2dt(int line, WORD d, WORD m, WORD y, WORD h, WORD mn, diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 56ab2b3..dabe746 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1129,30 +1129,47 @@ static inline double VARIANT_JulianFromDMY(USHORT year, USHORT month, USHORT day static HRESULT VARIANT_RollUdate(UDATE *lpUd) { static const BYTE days[] = { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; + short iYear, iMonth, iDay, iHour, iMinute, iSecond; - TRACE("Raw date: %d/%d/%d %d:%d:%d\n", lpUd->st.wDay, lpUd->st.wMonth, - lpUd->st.wYear, lpUd->st.wHour, lpUd->st.wMinute, lpUd->st.wSecond); + /* interpret values signed */ + iYear = lpUd->st.wYear; + iMonth = lpUd->st.wMonth; + iDay = lpUd->st.wDay; + iHour = lpUd->st.wHour; + iMinute = lpUd->st.wMinute; + iSecond = lpUd->st.wSecond; - /* Years < 100 are treated as 1900 + year */ - if (lpUd->st.wYear < 100) - lpUd->st.wYear += 1900; + TRACE("Raw date: %d/%d/%d %d:%d:%d\n", iDay, iMonth, + iYear, iHour, iMinute, iSecond); - if (!lpUd->st.wMonth) - { - /* Roll back to December of the previous year */ - lpUd->st.wMonth = 12; - lpUd->st.wYear--; - } - else while (lpUd->st.wMonth > 12) + if (iYear > 9999 || iYear < -9999) + return E_INVALIDARG; /* Invalid value */ + /* Years < 100 are treated as 1900 + year */ + if (iYear >= 0 && iYear < 100) + iYear += 1900; + + iMinute += (iSecond - (iSecond % 60)) / 60; + iSecond = iSecond % 60; + iHour += (iMinute - (iMinute % 60)) / 60; + iMinute = iMinute % 60; + iDay += (iHour - (iHour % 24)) / 24; + iHour = iHour % 24; + /* FIXME: Roll Days */ + iYear += (iMonth - (iMonth % 12)) / 12; + iMonth = iMonth % 12; + + if (iSecond<0){iSecond+=60; iMinute--;} + if (iMinute<0){iMinute+=60; iHour--;} + if (iHour<0) {iHour+=24; iDay--;} + if (iDay<0) { - /* Roll forward the correct number of months */ - lpUd->st.wYear++; - lpUd->st.wMonth -= 12; + iDay+=days[iMonth]; + iMonth--; + if (iMonth == 2 && IsLeapYear(iYear)) + iDay++; } - - if (lpUd->st.wYear > 9999 || lpUd->st.wHour > 23 || - lpUd->st.wMinute > 59 || lpUd->st.wSecond > 59) - return E_INVALIDARG; /* Invalid values */ + if (iMonth<=0) {iMonth+=12; iYear--;} + if (iYear<0) iYear+=2000; if (!lpUd->st.wDay) { @@ -1178,22 +1195,30 @@ static HRESULT VARIANT_RollUdate(UDATE *lpUd) int rollForward = 0; /* Possibly need to roll the date forward */ - if (lpUd->st.wMonth == 2 && IsLeapYear(lpUd->st.wYear)) - rollForward = lpUd->st.wDay - 29; /* February has 29 days on leap years */ + if (iMonth == 2 && IsLeapYear(iYear)) + rollForward = iDay - 29; /* February has 29 days on leap years */ else - rollForward = lpUd->st.wDay - days[lpUd->st.wMonth]; + rollForward = iDay - days[iMonth]; if (rollForward > 0) { - lpUd->st.wDay = rollForward; - lpUd->st.wMonth++; - if (lpUd->st.wMonth > 12) + iDay = rollForward; + iMonth++; + if (iMonth > 12) { - lpUd->st.wMonth = 1; /* Roll forward into January of the next year */ - lpUd->st.wYear++; + iMonth = 1; /* Roll forward into January of the next year */ + iYear++; } } } + + lpUd->st.wYear = iYear; + lpUd->st.wMonth = iMonth; + lpUd->st.wDay = iDay; + lpUd->st.wHour = iHour; + lpUd->st.wMinute = iMinute; + lpUd->st.wSecond = iSecond; + TRACE("Rolled date: %d/%d/%d %d:%d:%d\n", lpUd->st.wDay, lpUd->st.wMonth, lpUd->st.wYear, lpUd->st.wHour, lpUd->st.wMinute, lpUd->st.wSecond); return S_OK; @@ -1250,6 +1275,8 @@ INT WINAPI DosDateTimeToVariantTime(USHORT wDosDate, USHORT wDosTime, ud.st.wMinute = DOS_MINUTE(wDosTime); ud.st.wSecond = DOS_SECOND(wDosTime); ud.st.wDayOfWeek = ud.st.wMilliseconds = 0; + if (ud.st.wHour > 23 || ud.st.wMinute > 59 || ud.st.wSecond > 59) + return FALSE; /* Invalid values in Dos*/ return VarDateFromUdate(&ud, 0, pDateOut) == S_OK; }

1 0

Alexandre Julliard : user: Call the 16-bit CreateIconFromResourceEx from LoadIconHandler16.
by Alexandre Julliard Feb. 2, 2010

Feb. 2, 2010

Module: wine Branch: master Commit: 3d55d1430bbfcc34a00498667224914876fa9e09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d55d1430bbfcc34a00498667… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 20:36:35 2010 +0100 user: Call the 16-bit CreateIconFromResourceEx from LoadIconHandler16. --- dlls/user.exe16/user.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 7d60bac..d415f78 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -2614,9 +2614,8 @@ WORD WINAPI GetIconID16( HGLOBAL16 hResource, DWORD resType ) */ HICON16 WINAPI LoadIconHandler16( HGLOBAL16 hResource, BOOL16 bNew ) { - LPBYTE bits = LockResource16( hResource ); - return HICON_16(CreateIconFromResourceEx( bits, 0, TRUE, - bNew ? 0x00030000 : 0x00020000, 0, 0, LR_DEFAULTCOLOR)); + return CreateIconFromResourceEx16( LockResource16( hResource ), 0, TRUE, + bNew ? 0x00030000 : 0x00020000, 0, 0, LR_DEFAULTCOLOR ); }

1 0

Luca Bennati : uninstaller: Fix Italian translation.
by Alexandre Julliard Feb. 2, 2010

Feb. 2, 2010

Module: wine Branch: master Commit: d92b85de233936d72358430645e3158b3f3a7f85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d92b85de233936d7235843064… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Feb 1 11:41:01 2010 +0100 uninstaller: Fix Italian translation. --- programs/uninstaller/It.rc | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/uninstaller/It.rc b/programs/uninstaller/It.rc index 3eaad1f..66d33be 100644 --- a/programs/uninstaller/It.rc +++ b/programs/uninstaller/It.rc @@ -20,9 +20,12 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { IDS_APPNAME, "Wine Disinstallazione Applicazioni" -IDS_UNINSTALLFAILED, "Esecuzione del comando di disinstallazione '%s' � fallita, forse a causa di un eseguibile mancante.\r\nVuoi rimuovere dal registro la entry di disinstallazione?" +IDS_UNINSTALLFAILED, "L'esecuzione del comando di disinstallazione '%s' è fallita, forse a causa di un eseguibile mancante.\r\nVuoi rimuovere dal registro la voce di disinstallazione?" }

1 0

Dan Kegel : ntdll: Fix large block realloc annotation.
by Alexandre Julliard Feb. 2, 2010

Feb. 2, 2010

Module: wine Branch: master Commit: 20430f6edefe0f299fe27303ec9e153873023ee0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20430f6edefe0f299fe27303e… Author: Dan Kegel <dank(a)kegel.com> Date: Mon Feb 1 11:25:35 2010 -0800 ntdll: Fix large block realloc annotation. --- dlls/ntdll/heap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 4c73184..b440b61 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -767,6 +767,7 @@ static void *realloc_large_block( HEAP *heap, DWORD flags, void *ptr, SIZE_T siz } memcpy( new_ptr, ptr, arena->data_size ); free_large_block( heap, flags, ptr ); + notify_free( ptr ); return new_ptr; } @@ -1811,7 +1812,6 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size if (!subheap) { if (!(ret = realloc_large_block( heapPtr, flags, ptr, size ))) goto oom; - notify_free( ptr ); goto done; }

1 0

Luca Bennati : view: Fix Italian translation.
by Alexandre Julliard Feb. 2, 2010

Feb. 2, 2010

Module: wine Branch: master Commit: 7bc4c7425dadd9e3b09404f2d6cbbd94e5299e67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bc4c7425dadd9e3b09404f2d… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Feb 1 11:45:09 2010 +0100 view: Fix Italian translation. --- programs/view/It.rc | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/view/It.rc b/programs/view/It.rc index 0839c44..c54c264 100644 --- a/programs/view/It.rc +++ b/programs/view/It.rc @@ -23,6 +23,9 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL /* @@ -44,7 +47,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Sinistra", IDM_LEFT MENUITEM "&Destra", IDM_RIGHT - MENUITEM "&Alto", IDM_UP + MENUITEM "A&lto", IDM_UP MENUITEM "&Basso", IDM_DOWN END END

1 0

Michael Stefaniuc : dinput: Don' t use HIWORD to check if a REFGUID is a DIPROP.
by Alexandre Julliard Feb. 2, 2010

Feb. 2, 2010

Module: wine Branch: master Commit: 2004db1bb1b7aca9259a756449c3ddf3872426a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2004db1bb1b7aca9259a75644… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 2 00:11:49 2010 +0100 dinput: Don't use HIWORD to check if a REFGUID is a DIPROP. --- dlls/dinput/device.c | 4 ++-- dlls/dinput/dinput_private.h | 2 ++ dlls/dinput/joystick.c | 4 ++-- dlls/dinput/joystick_linuxinput.c | 4 ++-- dlls/dinput/keyboard.c | 2 +- dlls/dinput/mouse.c | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index c0f15ff..a5c61ab 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -872,7 +872,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_GetProperty( TRACE("(%p) %s,%p\n", iface, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); - if (HIWORD(rguid)) return DI_OK; + if (!IS_DIPROP(rguid)) return DI_OK; switch (LOWORD(rguid)) { @@ -906,7 +906,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_SetProperty( TRACE("(%p) %s,%p\n", iface, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); - if (HIWORD(rguid)) return DI_OK; + if (!IS_DIPROP(rguid)) return DI_OK; switch (LOWORD(rguid)) { diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index ddb9aa0..16b4559 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -65,4 +65,6 @@ typedef int (*DI_EVENT_PROC)(LPDIRECTINPUTDEVICE8A, WPARAM, LPARAM); extern void _dump_diactionformatA(LPDIACTIONFORMATA); +#define IS_DIPROP(x) (((ULONG_PTR)(x) >> 16) == 0) + #endif /* __WINE_DLLS_DINPUT_DINPUT_PRIVATE_H */ diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 84e45c9..0f39a6d 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -53,7 +53,7 @@ HRESULT WINAPI JoystickAGenericImpl_SetProperty( if (TRACE_ON(dinput)) _dump_DIPROPHEADER(ph); - if (!HIWORD(rguid)) { + if (IS_DIPROP(rguid)) { switch (LOWORD(rguid)) { case (DWORD_PTR)DIPROP_RANGE: { LPCDIPROPRANGE pr = (LPCDIPROPRANGE)ph; @@ -230,7 +230,7 @@ HRESULT WINAPI JoystickAGenericImpl_GetProperty( if (TRACE_ON(dinput)) _dump_DIPROPHEADER(pdiph); - if (!HIWORD(rguid)) { + if (IS_DIPROP(rguid)) { switch (LOWORD(rguid)) { case (DWORD_PTR) DIPROP_RANGE: { LPDIPROPRANGE pr = (LPDIPROPRANGE)pdiph; diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 6c3c8cc..6da6066 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -847,7 +847,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, TRACE("ph.dwSize = %d, ph.dwHeaderSize =%d, ph.dwObj = %d, ph.dwHow= %d\n", ph->dwSize, ph->dwHeaderSize, ph->dwObj, ph->dwHow); - if (!HIWORD(rguid)) { + if (IS_DIPROP(rguid)) { switch (LOWORD(rguid)) { case (DWORD_PTR)DIPROP_CALIBRATIONMODE: { LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; @@ -898,7 +898,7 @@ static HRESULT WINAPI JoystickAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, TRACE("(this=%p,%s,%p)\n", iface, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); - if (HIWORD(rguid)) return DI_OK; + if (!IS_DIPROP(rguid)) return DI_OK; switch (LOWORD(rguid)) { case (DWORD_PTR) DIPROP_AUTOCENTER: diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 3692878..4f6aac5 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -447,7 +447,7 @@ static HRESULT WINAPI SysKeyboardAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, TRACE("(%p) %s,%p\n", iface, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); - if (HIWORD(rguid)) return DI_OK; + if (!IS_DIPROP(rguid)) return DI_OK; switch (LOWORD(rguid)) { diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 4809c56..e05d9e2 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -587,7 +587,7 @@ static HRESULT WINAPI SysMouseAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, TRACE("(%p) %s,%p\n", This, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); - if (!HIWORD(rguid)) { + if (IS_DIPROP(rguid)) { switch (LOWORD(rguid)) { case (DWORD_PTR) DIPROP_GRANULARITY: { LPDIPROPDWORD pr = (LPDIPROPDWORD) pdiph;

1 0

Luca Bennati : wineconsole: Fix Italian translation.
by Alexandre Julliard Feb. 2, 2010

Feb. 2, 2010

Module: wine Branch: master Commit: 4cd6feffb4855f9607a4de61d8d9c3bab081b039 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cd6feffb4855f9607a4de61d… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Feb 1 14:14:59 2010 +0100 wineconsole: Fix Italian translation. --- programs/wineconsole/wineconsole_It.rc | 26 +++++++++++++++++++++----- 1 files changed, 21 insertions(+), 5 deletions(-) diff --git a/programs/wineconsole/wineconsole_It.rc b/programs/wineconsole/wineconsole_It.rc index bc1f901..61b7b9d 100644 --- a/programs/wineconsole/wineconsole_It.rc +++ b/programs/wineconsole/wineconsole_It.rc @@ -18,26 +18,42 @@ #include "wineconsole_res.h" +/*UTF-8*/ +#pragma code_page(65001) + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN IDS_EDIT, "&Modifica" IDS_DEFAULT, "Imposta &Default" -IDS_PROPERTIES, "&Propriet�" +IDS_PROPERTIES, "&Proprietà" IDS_MARK, "Mark&" IDS_COPY, "&Copia" IDS_PASTE, "&Incolla" IDS_SELECTALL, "&Seleziona tutto" IDS_SCROLL, "Sc&orri" IDS_SEARCH, "C&erca" -IDS_FNT_DISPLAY, "Il carattere � %ld pixel di larghezza e %ld pixel di altezza" -IDS_FNT_PREVIEW_1, "Questa � una prova" +IDS_FNT_DISPLAY, "Il carattere è %ld pixel di larghezza e %ld pixel di altezza" +IDS_FNT_PREVIEW_1, "Questa è una prova" IDS_FNT_PREVIEW_2, "" IDS_DLG_TIT_DEFAULT, "Impostazioni di Default" IDS_DLG_TIT_CURRENT, "Impostazioni correnti" IDS_DLG_TIT_ERROR, "Errore di configurazione" -IDS_DLG_ERR_SBWINSIZE, "Il buffer dello schermo deve essere pi� grande o uguale a quello della finestra" +IDS_DLG_ERR_SBWINSIZE, "Il buffer dello schermo deve essere più grande o uguale a quello della finestra" + +IDS_CMD_INVALID_EVENT_ID "wineconsole: impossibile parse event id\n" +IDS_CMD_INVALID_BACKEND "wineconsole: backend non valido\n" +IDS_CMD_INVALID_OPTION "wineconsole: opzione della linea di comando non riconosciuta\n" +IDS_CMD_ABOUT "Avvia un programma in una console Wine\n" +IDS_CMD_LAUNCH_FAILED "wineconsole: Impossibile avviare %s.\n"\ + "Il comando non è valido.\n" + +IDS_USAGE_HEADER "\nUso:\n wineconsole [opzioni] <comando>\n\nOpzioni:\n" +IDS_USAGE_BACKEND " --backend={user|curses} Scegliere user farà aprire una nuova finestra, curses proverà\n"\ + " ad inizializzare terminale corrente come una console Wine\n" +IDS_USAGE_COMMAND " <comando> Il programma di Wine da lanciare in una console\n" +IDS_USAGE_FOOTER "\nEsempio:\n wineconsole cmd\nAvvia il prompt dei comandi di Wine in una console Wine\n\n" END IDD_OPTION DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 @@ -66,7 +82,7 @@ FONT 8, "MS Shell Dlg" IDD_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION " Caratteri " +CAPTION " Carattere " FONT 8, "MS Shell Dlg" { LTEXT "&Font", -1, 5, 5, 24, 8

1 0