August 2006 - Wine-Commits - list.winehq.org

Stefan Leichter : ntdll/tests: Print 64bit integers as two 32 bit integers.
by Alexandre Julliard Aug. 23, 2006

Aug. 23, 2006

Module: wine Branch: master Commit: 0e592aa9bd295e99f15fbcf658223232a5696e9e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0e592aa9bd295e99f15fbcf… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Aug 23 00:16:51 2006 +0200 ntdll/tests: Print 64bit integers as two 32 bit integers. --- dlls/ntdll/tests/large_int.c | 61 +++++++++++++++++++++++++----------------- dlls/ntdll/tests/rtl.c | 28 ++++++++++--------- dlls/ntdll/tests/rtlbitmap.c | 12 ++++++-- dlls/ntdll/tests/string.c | 43 +++++++++++++++++------------- 4 files changed, 84 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=0e592aa9bd295e99f15…

1 0

Roderick Colenbrander : winex11.drv: Fix opengl pixel format bug.
by Alexandre Julliard Aug. 23, 2006

Aug. 23, 2006

Module: wine Branch: master Commit: 8922e20096f2c5c1de9108fee57ab0e1f93acddc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8922e20096f2c5c1de9108f… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Wed Aug 23 00:03:16 2006 +0000 winex11.drv: Fix opengl pixel format bug. --- dlls/winex11.drv/opengl.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 1793a09..22930ac 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2,6 +2,7 @@ * X11DRV OpenGL functions * * Copyright 2000 Lionel Ulmer + * Copyright 2006 Roderick Colenbrander * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -255,7 +256,7 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEV int value = 0; /* Pixel type */ - pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index], GLX_RENDER_TYPE, &value); + pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index - 1], GLX_RENDER_TYPE, &value); if (value & GLX_RGBA_BIT) iPixelType = PFD_TYPE_RGBA; else @@ -266,7 +267,7 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEV } /* Doublebuffer */ - pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index], GLX_DOUBLEBUFFER, &value); if (value) dwFlags |= PFD_DOUBLEBUFFER; + pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index - 1], GLX_DOUBLEBUFFER, &value); if (value) dwFlags |= PFD_DOUBLEBUFFER; if (!(ppfd->dwFlags & PFD_DOUBLEBUFFER_DONTCARE)) { if ((ppfd->dwFlags & PFD_DOUBLEBUFFER) != (dwFlags & PFD_DOUBLEBUFFER)) { goto choose_exit; @@ -274,7 +275,7 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEV } /* Stereo */ - pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index], GLX_STEREO, &value); if (value) dwFlags |= PFD_STEREO; + pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index - 1], GLX_STEREO, &value); if (value) dwFlags |= PFD_STEREO; if (!(ppfd->dwFlags & PFD_STEREO_DONTCARE)) { if ((ppfd->dwFlags & PFD_STEREO) != (dwFlags & PFD_STEREO)) { goto choose_exit; @@ -282,25 +283,25 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEV } /* Alpha bits */ - pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index], GLX_ALPHA_SIZE, &value); + pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index - 1], GLX_ALPHA_SIZE, &value); if (ppfd->iPixelType==PFD_TYPE_RGBA && ppfd->cAlphaBits && !value) { goto choose_exit; } /* Depth bits */ - pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index], GLX_DEPTH_SIZE, &value); + pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index - 1], GLX_DEPTH_SIZE, &value); if (ppfd->cDepthBits && !value) { goto choose_exit; } /* Stencil bits */ - pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index], GLX_STENCIL_SIZE, &value); + pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index - 1], GLX_STENCIL_SIZE, &value); if (ppfd->cStencilBits && !value) { goto choose_exit; } /* Aux buffers */ - pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index], GLX_AUX_BUFFERS, &value); + pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index - 1], GLX_AUX_BUFFERS, &value); if (ppfd->cAuxBuffers && !value) { goto choose_exit; }

1 0

Fatih Aşıcı : mshtml: Update Turkish resources.
by Alexandre Julliard Aug. 23, 2006

Aug. 23, 2006

Module: wine Branch: master Commit: 859f8bce7293c3e483284af5168dd1f3009213fe URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=859f8bce7293c3e483284af… Author: Fatih Aşıcı <fatih.asici(a)gmail.com> Date: Tue Aug 22 19:35:28 2006 +0300 mshtml: Update Turkish resources. --- dlls/mshtml/Tr.rc | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/Tr.rc b/dlls/mshtml/Tr.rc index b9853e1..201e3e2 100644 --- a/dlls/mshtml/Tr.rc +++ b/dlls/mshtml/Tr.rc @@ -21,8 +21,23 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - IDS_HTMLDISABLED "HTML �evirisi devre d��." + IDS_HTMLDISABLED "HTML motoru �u an devre d��." IDS_HTMLDOCUMENT "HTML Belgesi" + IDS_DOWNLOADING "�ndiriliyor..." + IDS_INSTALLING "Kuruluyor..." +} + +ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Wine Gecko Kurucusu" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Bu uygulama bir HTML sayfas� g�stermeye �al��yor. Wine, sayfan�n g�sterilmesi " \ + "i�in Gecko (Mozilla HTML motoru)'nun kurulu olmas�n� gerektirir. Gecko motorunun " \ + "otomatik olarak indirilmesi ve kurulmas� i�in Kur'u t�klay�n.", ID_DWL_STATUS, 10, 10, 240, 30, SS_CENTER + CONTROL "�lerleme", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 + PUSHBUTTON "�ptal", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Kur", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP } /* FIXME: This should be in shdoclc.dll */ @@ -232,8 +247,8 @@ IDR_BROWSE_CONTEXT_MENU MENU { MENUITEM "Buraya Kayd�r", IDM_SCROLLHERE MENUITEM SEPARATOR - MENUITEM "Left Edge", IDM_LEFTEDGE - MENUITEM "Right Edge", IDM_RIGHTEDGE + MENUITEM "Sol Kenar", IDM_LEFTEDGE + MENUITEM "Sa� Kenar", IDM_RIGHTEDGE MENUITEM SEPARATOR MENUITEM "Soldaki Sayfa", IDM_PAGELEFT MENUITEM "Sa�daki Sayfa", IDM_PAGERIGHT

1 0

Juan Lang : crypt32: Add CryptFormatObject stub.
by Alexandre Julliard Aug. 23, 2006

Aug. 23, 2006

Module: wine Branch: master Commit: 9958987f18c0d36b718513f2ade17466d33ca36b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9958987f18c0d36b718513f… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Aug 22 08:10:17 2006 -0700 crypt32: Add CryptFormatObject stub. --- dlls/crypt32/crypt32.spec | 2 +- dlls/crypt32/main.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 432e12e..1a61095 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -113,7 +113,7 @@ @ stdcall CryptExportPublicKeyInfo(long long long ptr ptr) @ stdcall CryptExportPublicKeyInfoEx(long long long str long ptr ptr ptr) @ stdcall CryptFindOIDInfo(long ptr long) -@ stub CryptFormatObject +@ stdcall CryptFormatObject(long long long ptr str ptr long ptr ptr) @ stdcall CryptFreeOIDFunctionAddress(long long) @ stub CryptGetAsyncParam @ stdcall CryptGetDefaultOIDDllList(long long ptr ptr) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 3e6b0e5..28f63c8 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -367,6 +367,16 @@ BOOL WINAPI I_CryptUninstallAsn1Module(v return TRUE; } +BOOL WINAPI CryptFormatObject(DWORD dwCertEncodingType, DWORD dwFormatType, + DWORD dwFormatStrType, void *pFormatStruct, LPCSTR lpszStructType, + const BYTE *pbEncoded, DWORD cbEncoded, void *pbFormat, DWORD *pcbFormat) +{ + FIXME("(%08lx, %ld, %ld, %p, %s, %p, %ld, %p, %p): stub\n", + dwCertEncodingType, dwFormatType, dwFormatStrType, pFormatStruct, + debugstr_a(lpszStructType), pbEncoded, cbEncoded, pbFormat, pcbFormat); + return FALSE; +} + BOOL WINAPI CryptQueryObject(DWORD dwObjectType, const void* pvObject, DWORD dwExpectedContentTypeFlags, DWORD dwExpectedFormatTypeFlags, DWORD dwFlags, DWORD* pdwMsgAndCertEncodingType, DWORD* pdwContentType,

1 0

Mikołaj Zalewski : shell32: Pl.rc: Fix a backslash.
by Alexandre Julliard Aug. 23, 2006

Aug. 23, 2006

Module: wine Branch: master Commit: 0721dd254dc1919095433efba8905e3c8fd92c85 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0721dd254dc1919095433ef… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Aug 22 18:24:17 2006 +0200 shell32: Pl.rc: Fix a backslash. --- dlls/shell32/shell32_Pl.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32_Pl.rc b/dlls/shell32/shell32_Pl.rc index 05dc6c3..60b6a75 100644 --- a/dlls/shell32/shell32_Pl.rc +++ b/dlls/shell32/shell32_Pl.rc @@ -209,5 +209,5 @@ STRINGTABLE DISCARDABLE IDS_COMMON_MUSIC "Documenty\\Moja muzyka" IDS_COMMON_PICTURES "Documenty\\Moje obrazy" IDS_COMMON_VIDEO "Documenty\\Moje wideo" - IDS_CDBURN_AREA "Ustawienia lokalne\Dane aplikacji\\Microsoft\\Nagrywanie dysk�w CD" + IDS_CDBURN_AREA "Ustawienia lokalne\\Dane aplikacji\\Microsoft\\Nagrywanie dysk�w CD" }

1 0

Jacek Caban : mshtml: Use IPropertyNotifySink connection point.
by Alexandre Julliard Aug. 23, 2006

Aug. 23, 2006

Module: wine Branch: master Commit: 593e897655d8085846180537cafbf0c032886d43 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=593e897655d808584618053… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 22 16:15:09 2006 +0200 mshtml: Use IPropertyNotifySink connection point. --- dlls/mshtml/conpoint.c | 10 +++++++ dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/olecmd.c | 2 + dlls/mshtml/persist.c | 2 + dlls/mshtml/tests/htmldoc.c | 64 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 80 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index db66160..9b82051 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -51,6 +51,16 @@ struct ConnectionPoint { IID iid; }; +void call_property_onchanged(ConnectionPoint *This, DISPID dispid) +{ + DWORD i; + + for(i=0; i<This->sinks_size; i++) { + if(This->sinks[i].propnotif) + IPropertyNotifySink_OnChanged(This->sinks[i].propnotif, dispid); + } +} + #define CONPOINT_THIS(iface) DEFINE_THIS(ConnectionPoint, ConnectionPoint, iface) static HRESULT WINAPI ConnectionPoint_QueryInterface(IConnectionPoint *iface, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7abcf7e..99de822 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -298,6 +298,8 @@ void init_nsio(nsIComponentManager*,nsIC void hlink_frame_navigate(HTMLDocument*,IHlinkFrame*,LPCWSTR,nsIInputStream*,DWORD); +void call_property_onchanged(ConnectionPoint*,DISPID); + void *nsalloc(size_t); void nsfree(void*); diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index ef0de64..72d6d98 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -397,6 +397,8 @@ static HRESULT exec_editmode(HTMLDocumen if(This->nscontainer) setup_ns_editing(This->nscontainer); + call_property_onchanged(This->cp_propnotif, DISPID_READYSTATE); + return S_OK; } diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index d6a49f5..15af135 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -191,6 +191,8 @@ static HRESULT WINAPI PersistMoniker_Loa } } + call_property_onchanged(This->cp_propnotif, DISPID_READYSTATE); + HTMLDocument_LockContainer(This, TRUE); hres = IMoniker_GetDisplayName(pimkName, pibc, NULL, &url); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 9f814bd..227ca42 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -103,6 +103,7 @@ DEFINE_EXPECT(GetDropTarget); DEFINE_EXPECT(UpdateUI); DEFINE_EXPECT(Navigate); DEFINE_EXPECT(OnFrameWindowActivate); +DEFINE_EXPECT(OnChanged_READYSTATE); static BOOL expect_LockContainer_fLock; static BOOL expect_SetActiveObject_active; @@ -212,6 +213,56 @@ static const IHlinkFrameVtbl HlinkFrameV static IHlinkFrame HlinkFrame = { &HlinkFrameVtbl }; +static HRESULT WINAPI PropertyNotifySink_QueryInterface(IPropertyNotifySink *iface, + REFIID riid, void**ppv) +{ + if(IsEqualGUID(&IID_IPropertyNotifySink, riid)) { + *ppv = iface; + return S_OK; + } + + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI PropertyNotifySink_AddRef(IPropertyNotifySink *iface) +{ + return 2; +} + +static ULONG WINAPI PropertyNotifySink_Release(IPropertyNotifySink *iface) +{ + return 1; +} + +static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, DISPID dispID) +{ + switch(dispID) { + case DISPID_READYSTATE: + CHECK_EXPECT(OnChanged_READYSTATE); + return S_OK; + } + + ok(0, "unexpected id %ld\n", dispID); + return E_NOTIMPL; +} + +static HRESULT WINAPI PropertyNotifySink_OnRequestEdit(IPropertyNotifySink *iface, DISPID dispID) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static IPropertyNotifySinkVtbl PropertyNotifySinkVtbl = { + PropertyNotifySink_QueryInterface, + PropertyNotifySink_AddRef, + PropertyNotifySink_Release, + PropertyNotifySink_OnChanged, + PropertyNotifySink_OnRequestEdit +}; + +static IPropertyNotifySink PropertyNotifySink = { &PropertyNotifySinkVtbl }; + static HRESULT WINAPI OleContainer_QueryInterface(IOleContainer *iface, REFIID riid, void **ppv) { return QueryInterface(riid, ppv); @@ -1293,6 +1344,13 @@ static void test_ConnectionPoint(IConnec hres = IConnectionPoint_GetConnectionPointContainer(cp, NULL); ok(hres == E_POINTER, "GetConnectionPointContainer failed: %08lx, expected E_POINTER\n", hres); + if(IsEqualGUID(&IID_IPropertyNotifySink, riid)) { + DWORD cookie; + + hres = IConnectionPoint_Advise(cp, (IUnknown*)&PropertyNotifySink, &cookie); + ok(hres == S_OK, "Advise failed: %08lx\n", hres); + } + IConnectionPoint_Release(cp); } @@ -1344,6 +1402,7 @@ static void test_Load(IPersistMoniker *p SET_EXPECT(Invoke_AMBIENT_SILENT); SET_EXPECT(Invoke_AMBIENT_USERAGENT); SET_EXPECT(Invoke_AMBIENT_PALETTE); + SET_EXPECT(OnChanged_READYSTATE); SET_EXPECT(GetContainer); SET_EXPECT(LockContainer); SET_EXPECT(Exec_ShellDocView_37); @@ -1367,6 +1426,7 @@ #endif CHECK_CALLED(Invoke_AMBIENT_SILENT); CHECK_CALLED(Invoke_AMBIENT_USERAGENT); CHECK_CALLED(Invoke_AMBIENT_PALETTE); + CHECK_CALLED(OnChanged_READYSTATE); CHECK_CALLED(GetContainer); CHECK_CALLED(LockContainer); CHECK_CALLED(Exec_ShellDocView_37); @@ -1624,6 +1684,7 @@ static void test_exec_editmode(IUnknown SET_EXPECT(GetHostInfo); SET_EXPECT(Invoke_AMBIENT_SILENT); SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + SET_EXPECT(OnChanged_READYSTATE); expect_status_text = NULL; hres = IOleCommandTarget_Exec(cmdtrg, &CGID_MSHTML, IDM_EDITMODE, @@ -1635,6 +1696,7 @@ static void test_exec_editmode(IUnknown CHECK_CALLED(GetHostInfo); CHECK_CALLED(Invoke_AMBIENT_SILENT); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + CHECK_CALLED(OnChanged_READYSTATE); IOleCommandTarget_Release(cmdtrg); } @@ -2149,6 +2211,7 @@ static void test_HTMLDocument_hlink(void if(FAILED(hres)) return; + test_ConnectionPointContainer(unk); test_Persist(unk); test_Navigate(unk); @@ -2185,6 +2248,7 @@ static void test_editing_mode(void) hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); ok(hres == S_OK, "Could not get IOleObject: %08lx\n", hres); + test_ConnectionPointContainer(unk); test_ClientSite(oleobj, CLIENTSITE_EXPECTPATH); test_DoVerb(oleobj);

1 0

Robert Reif : dsound: Remove unused parameter from propset functions.
by Alexandre Julliard Aug. 23, 2006

Aug. 23, 2006

Module: wine Branch: master Commit: 02bd4ad43724da495f1b12ab2e242cfdd7c5dece URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=02bd4ad43724da495f1b12a… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Aug 22 07:36:08 2006 -0400 dsound: Remove unused parameter from propset functions. --- dlls/dsound/propset.c | 600 ++++++++++++++++++++++++------------------------- 1 files changed, 290 insertions(+), 310 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=02bd4ad43724da495f1…

1 0

Mikołaj Zalewski : shlwapi: Make StrFormatByteSize format numbers using locale settings.
by Alexandre Julliard Aug. 23, 2006

Aug. 23, 2006

Module: wine Branch: master Commit: c4c00040ba40580035bc547ee561b14396cada25 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c4c00040ba40580035bc547… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Aug 22 16:52:52 2006 +0200 shlwapi: Make StrFormatByteSize format numbers using locale settings. --- dlls/shlwapi/string.c | 127 +++++++++++++++++++++++++++++-------------------- 1 files changed, 76 insertions(+), 51 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 34ab520..8551c91 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -66,6 +66,38 @@ static HRESULT WINAPI _SHStrDupAA(LPCSTR static HRESULT WINAPI _SHStrDupAW(LPCWSTR,LPSTR*); +static void FillNumberFmt(NUMBERFMTW *fmt, WCHAR decimal_buffer[8], WCHAR thousand_buffer[8]) +{ + WCHAR grouping[64]; + WCHAR *c; + + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_ILZERO|LOCALE_RETURN_NUMBER, (LPWSTR)&fmt->LeadingZero, sizeof(fmt->LeadingZero)/sizeof(WCHAR)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_INEGNUMBER|LOCALE_RETURN_NUMBER, (LPWSTR)&fmt->LeadingZero, sizeof(fmt->NegativeOrder)/sizeof(WCHAR)); + fmt->NumDigits = 0; + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, decimal_buffer, sizeof(decimal_buffer)/sizeof(WCHAR)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, thousand_buffer, sizeof(thousand_buffer)/sizeof(WCHAR)); + fmt->lpThousandSep = thousand_buffer; + fmt->lpDecimalSep = decimal_buffer; + + /* + * Converting grouping string to number as described on + * http://blogs.msdn.com/oldnewthing/archive/2006/04/18/578251.aspx + */ + fmt->Grouping = 0; + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SGROUPING, grouping, sizeof(grouping)/sizeof(WCHAR)); + for (c = grouping; *c; c++) + if (*c >= '0' && *c < '9') + { + fmt->Grouping *= 10; + fmt->Grouping += *c - '0'; + } + + if (fmt->Grouping % 10 == 0) + fmt->Grouping /= 10; + else + fmt->Grouping *= 10; +} + /************************************************************************* * FormatInt [internal] * @@ -78,36 +110,11 @@ static int FormatInt(LONGLONG qdwValue, { NUMBERFMTW fmt; WCHAR decimal[8], thousand[8]; - WCHAR grouping[64]; WCHAR buf[24]; WCHAR *c; BOOL neg = (qdwValue < 0); - - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_ILZERO|LOCALE_RETURN_NUMBER, (LPWSTR)&fmt.LeadingZero, sizeof(fmt.LeadingZero)/sizeof(WCHAR)); - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_INEGNUMBER|LOCALE_RETURN_NUMBER, (LPWSTR)&fmt.LeadingZero, sizeof(fmt.NegativeOrder)/sizeof(WCHAR)); - fmt.NumDigits = 0; - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, decimal, sizeof(decimal)/sizeof(WCHAR)); - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, thousand, sizeof(thousand)/sizeof(WCHAR)); - fmt.lpThousandSep = thousand; - fmt.lpDecimalSep = decimal; - - /* - * Converting grouping string to number as described on - * http://blogs.msdn.com/oldnewthing/archive/2006/04/18/578251.aspx - */ - fmt.Grouping = 0; - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SGROUPING, grouping, sizeof(grouping)/sizeof(WCHAR)); - for (c = grouping; *c; c++) - if (*c >= '0' && *c < '9') - { - fmt.Grouping *= 10; - fmt.Grouping += *c - '0'; - } - if (fmt.Grouping % 10 == 0) - fmt.Grouping /= 10; - else - fmt.Grouping *= 10; + FillNumberFmt(&fmt, decimal, thousand); c = &buf[24]; *(--c) = 0; @@ -123,6 +130,29 @@ static int FormatInt(LONGLONG qdwValue, } /************************************************************************* + * FormatDouble [internal] + * + * Format an integer according to the current locale. Prints the specified number of digits + * after the decimal point + * + * RETURNS + * The number of bytes written on success or 0 on failure + */ +static int FormatDouble(double value, int decimals, LPWSTR pszBuf, int cchBuf) +{ + static const WCHAR flfmt[] = {'%','f',0}; + WCHAR buf[64]; + NUMBERFMTW fmt; + WCHAR decimal[8], thousand[8]; + + snprintfW(buf, 64, flfmt, value); + + FillNumberFmt(&fmt, decimal, thousand); + fmt.NumDigits = decimals; + return GetNumberFormatW(LOCALE_USER_DEFAULT, 0, buf, &fmt, pszBuf, cchBuf); +} + +/************************************************************************* * SHLWAPI_ChrCmpHelperA * * Internal helper for SHLWAPI_ChrCmpA/ChrCMPIA. @@ -2251,7 +2281,7 @@ typedef struct tagSHLWAPI_BYTEFORMATS LONGLONG dLimit; double dDivisor; double dNormaliser; - LPCWSTR lpwszFormat; + int nDecimals; WCHAR wPrefix; } SHLWAPI_BYTEFORMATS; @@ -2273,10 +2303,6 @@ typedef struct tagSHLWAPI_BYTEFORMATS */ LPWSTR WINAPI StrFormatByteSizeW(LONGLONG llBytes, LPWSTR lpszDest, UINT cchMax) { - static const WCHAR wsz3_0[] = {'%','3','.','0','f',0}; - static const WCHAR wsz3_1[] = {'%','3','.','1','f',0}; - static const WCHAR wsz3_2[] = {'%','3','.','2','f',0}; - #define KB ((ULONGLONG)1024) #define MB (KB*KB) #define GB (KB*KB*KB) @@ -2285,24 +2311,23 @@ #define PB (KB*KB*KB*KB*KB) static const SHLWAPI_BYTEFORMATS bfFormats[] = { - { 10*KB, 10.24, 100.0, wsz3_2, 'K' }, /* 10 KB */ - { 100*KB, 102.4, 10.0, wsz3_1, 'K' }, /* 100 KB */ - { 1000*KB, 1024.0, 1.0, wsz3_0, 'K' }, /* 1000 KB */ - { 10*MB, 10485.76, 100.0, wsz3_2, 'M' }, /* 10 MB */ - { 100*MB, 104857.6, 10.0, wsz3_1, 'M' }, /* 100 MB */ - { 1000*MB, 1048576.0, 1.0, wsz3_0, 'M' }, /* 1000 MB */ - { 10*GB, 10737418.24, 100.0, wsz3_2, 'G' }, /* 10 GB */ - { 100*GB, 107374182.4, 10.0, wsz3_1, 'G' }, /* 100 GB */ - { 1000*GB, 1073741824.0, 1.0, wsz3_0, 'G' }, /* 1000 GB */ - { 10*TB, 10485.76, 100.0, wsz3_2, 'T' }, /* 10 TB */ - { 100*TB, 104857.6, 10.0, wsz3_1, 'T' }, /* 100 TB */ - { 1000*TB, 1048576.0, 1.0, wsz3_0, 'T' }, /* 1000 TB */ - { 10*PB, 10737418.24, 100.00, wsz3_2, 'P' }, /* 10 PB */ - { 100*PB, 107374182.4, 10.00, wsz3_1, 'P' }, /* 100 PB */ - { 1000*PB, 1073741824.0, 1.00, wsz3_0, 'P' }, /* 1000 PB */ - { 0, 10995116277.76, 100.00, wsz3_2, 'E' } /* EB's, catch all */ + { 10*KB, 10.24, 100.0, 2, 'K' }, /* 10 KB */ + { 100*KB, 102.4, 10.0, 1, 'K' }, /* 100 KB */ + { 1000*KB, 1024.0, 1.0, 0, 'K' }, /* 1000 KB */ + { 10*MB, 10485.76, 100.0, 2, 'M' }, /* 10 MB */ + { 100*MB, 104857.6, 10.0, 1, 'M' }, /* 100 MB */ + { 1000*MB, 1048576.0, 1.0, 0, 'M' }, /* 1000 MB */ + { 10*GB, 10737418.24, 100.0, 2, 'G' }, /* 10 GB */ + { 100*GB, 107374182.4, 10.0, 1, 'G' }, /* 100 GB */ + { 1000*GB, 1073741824.0, 1.0, 0, 'G' }, /* 1000 GB */ + { 10*TB, 10485.76, 100.0, 2, 'T' }, /* 10 TB */ + { 100*TB, 104857.6, 10.0, 1, 'T' }, /* 100 TB */ + { 1000*TB, 1048576.0, 1.0, 0, 'T' }, /* 1000 TB */ + { 10*PB, 10737418.24, 100.00, 2, 'P' }, /* 10 PB */ + { 100*PB, 107374182.4, 10.00, 1, 'P' }, /* 100 PB */ + { 1000*PB, 1073741824.0, 1.00, 0, 'P' }, /* 1000 PB */ + { 0, 10995116277.76, 100.00, 2, 'E' } /* EB's, catch all */ }; - WCHAR wszBuff[32]; WCHAR wszAdd[] = {' ','?','B',0}; double dBytes; UINT i = 0; @@ -2342,10 +2367,10 @@ #define PB (KB*KB*KB*KB*KB) dBytes = floor(dBytes / bfFormats[i].dDivisor) / bfFormats[i].dNormaliser; - sprintfW(wszBuff, bfFormats[i].lpwszFormat, dBytes); + if (!FormatDouble(dBytes, bfFormats[i].nDecimals, lpszDest, cchMax)) + return NULL; wszAdd[1] = bfFormats[i].wPrefix; - strcatW(wszBuff, wszAdd); - lstrcpynW(lpszDest, wszBuff, cchMax); + StrCatBuffW(lpszDest, wszAdd, cchMax); return lpszDest; }

1 0

Gerald Pfeifer : configure: Try to #include <pthread.h> before checking for pthread_np.h.
by Alexandre Julliard Aug. 23, 2006

Aug. 23, 2006

Module: wine Branch: master Commit: 4ff90b472e3f1d7f3a300ca7ad71b0f3587ff179 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4ff90b472e3f1d7f3a300ca… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Aug 21 20:00:20 2006 +0200 configure: Try to #include <pthread.h> before checking for pthread_np.h. --- configure | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- configure.ac | 6 ++++ 2 files changed, 83 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 92e8a71..e783899 100755 --- a/configure +++ b/configure @@ -7662,7 +7662,6 @@ done - for ac_header in \ AudioUnit/AudioUnit.h \ CoreAudio/CoreAudio.h \ @@ -7717,7 +7716,6 @@ for ac_header in \ poll.h \ process.h \ pthread.h \ - pthread_np.h \ pwd.h \ regex.h \ sched.h \ @@ -8410,6 +8408,84 @@ done +for ac_header in pthread_np.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef HAVE_PTHREAD_H +#include <pthread.h> +#endif + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Header=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + for ac_header in linux/videodev.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` diff --git a/configure.ac b/configure.ac index 45fe3e0..4e9fc0b 100644 --- a/configure.ac +++ b/configure.ac @@ -203,7 +203,6 @@ AC_CHECK_HEADERS(\ poll.h \ process.h \ pthread.h \ - pthread_np.h \ pwd.h \ regex.h \ sched.h \ @@ -298,6 +297,11 @@ AC_CHECK_HEADERS([resolv.h],,, AC_CHECK_HEADERS(ucontext.h,,,[#include <signal.h>]) +AC_CHECK_HEADERS([pthread_np.h],,, +[#ifdef HAVE_PTHREAD_H +#include <pthread.h> +#endif]) + AC_CHECK_HEADERS([linux/videodev.h],,, [#ifdef HAVE_SYS_TIME_H #include <sys/time.h>

1 0

Stefan Dösinger : wined3d: Correctly draw transformed and untransformed vertices in the same scene.
by Alexandre Julliard Aug. 22, 2006

Aug. 22, 2006

Module: wine Branch: master Commit: d7f94bf7c93fac6267b45c63a88dcf5fb1c86d43 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d7f94bf7c93fac6267b45c6… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Aug 21 18:28:05 2006 +0200 wined3d: Correctly draw transformed and untransformed vertices in the same scene. --- dlls/wined3d/drawprim.c | 10 ++++++++-- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 5eb71f1..c2ed58c 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -182,8 +182,13 @@ void d3ddevice_set_ortho(IWineD3DDeviceI width = This->stateBlock->viewport.Width; minZ = This->stateBlock->viewport.MinZ; maxZ = This->stateBlock->viewport.MaxZ; - TRACE("Calling glOrtho with %f, %f, %f, %f\n", width, height, -minZ, -maxZ); - glOrtho(X, X + width, Y + height, Y, -minZ, -maxZ); + if(!This->untransformed) { + TRACE("Calling glOrtho with %f, %f, %f, %f\n", width, height, -minZ, -maxZ); + glOrtho(X, X + width, Y + height, Y, -minZ, -maxZ); + } else { + TRACE("Calling glOrtho with %f, %f, %f, %f\n", width, height, 1.0, -1.0); + glOrtho(X, X + width, Y + height, Y, 1.0, -1.0); + } checkGLcall("glOrtho"); /* Window Coord 0 is the middle of the first pixel, so translate by half @@ -258,6 +263,7 @@ static void primitiveInitState( } else { /* Untransformed, so relies on the view and projection matrices */ + This->untransformed = TRUE; if (!useVS && (This->last_was_rhw || !This->modelview_valid)) { /* Only reapply when have to */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 35b3a02..cfb8a7d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -513,6 +513,7 @@ #define NEEDS_DI UINT alphafunc; BOOL texture_shader_active; /* TODO: Confirm use is correct */ BOOL last_was_notclipped; + BOOL untransformed; /* State block related */ BOOL isRecordingState;

1 0