January 2013 - Wine-commits

Jacek Caban : mshtml: Get rid of remaining PRInt32 usage.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: cf2a24df07c69985e8dc715be6ccffee672c61ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf2a24df07c69985e8dc715be… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 18 14:05:59 2013 +0100 mshtml: Get rid of remaining PRInt32 usage. --- dlls/mshtml/editor.c | 2 +- dlls/mshtml/mutation.c | 12 ++++++------ dlls/mshtml/nsembed.c | 8 ++++---- dlls/mshtml/nsiface.idl | 3 +-- dlls/mshtml/nsservice.c | 4 ++-- dlls/mshtml/selection.c | 2 +- dlls/mshtml/txtrange.c | 2 +- 7 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 94fa7ac..6fee9c7 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -333,7 +333,7 @@ static void set_font_size(HTMLDocument *This, LPCWSTR size) cpp_bool collapsed; nsIDOMHTMLElement *elem; nsIDOMRange *range; - PRInt32 range_cnt = 0; + LONG range_cnt = 0; nsAString size_str; nsAString val_str; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index a00f81a..aeee77f 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -525,32 +525,32 @@ static void NSAPI nsDocumentObserver_CharacterDataChanged(nsIDocumentObserver *i } static void NSAPI nsDocumentObserver_AttributeWillChange(nsIDocumentObserver *iface, nsIDocument *aDocument, - nsIContent *aContent, PRInt32 aNameSpaceID, nsIAtom *aAttribute, PRInt32 aModType) + nsIContent *aContent, LONG aNameSpaceID, nsIAtom *aAttribute, LONG aModType) { } static void NSAPI nsDocumentObserver_AttributeChanged(nsIDocumentObserver *iface, nsIDocument *aDocument, - nsIContent *aContent, PRInt32 aNameSpaceID, nsIAtom *aAttribute, PRInt32 aModType) + nsIContent *aContent, LONG aNameSpaceID, nsIAtom *aAttribute, LONG aModType) { } static void NSAPI nsDocumentObserver_AttributeSetToCurrentValue(nsIDocumentObserver *iface, nsIDocument *aDocument, - void *aElement, PRInt32 aNameSpaceID, nsIAtom *aAttribute) + void *aElement, LONG aNameSpaceID, nsIAtom *aAttribute) { } static void NSAPI nsDocumentObserver_ContentAppended(nsIDocumentObserver *iface, nsIDocument *aDocument, - nsIContent *aContainer, nsIContent *aFirstNewContent, PRInt32 aNewIndexInContainer) + nsIContent *aContainer, nsIContent *aFirstNewContent, LONG aNewIndexInContainer) { } static void NSAPI nsDocumentObserver_ContentInserted(nsIDocumentObserver *iface, nsIDocument *aDocument, - nsIContent *aContainer, nsIContent *aChild, PRInt32 aIndexInContainer) + nsIContent *aContainer, nsIContent *aChild, LONG aIndexInContainer) { } static void NSAPI nsDocumentObserver_ContentRemoved(nsIDocumentObserver *iface, nsIDocument *aDocument, - nsIContent *aContainer, nsIContent *aChild, PRInt32 aIndexInContainer, + nsIContent *aContainer, nsIContent *aChild, LONG aIndexInContainer, nsIContent *aProviousSibling) { } diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index fdb11ed..6086846 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1333,7 +1333,7 @@ static nsresult NSAPI nsWebBrowserChrome_DestroyBrowserWindow(nsIWebBrowserChrom } static nsresult NSAPI nsWebBrowserChrome_SizeBrowserTo(nsIWebBrowserChrome *iface, - PRInt32 aCX, PRInt32 aCY) + LONG aCX, LONG aCY) { NSContainer *This = impl_from_nsIWebBrowserChrome(iface); WARN("(%p)->(%d %d)\n", This, aCX, aCY); @@ -1667,7 +1667,7 @@ static nsrefcnt NSAPI nsEmbeddingSiteWindow_Release(nsIEmbeddingSiteWindow *ifac } static nsresult NSAPI nsEmbeddingSiteWindow_SetDimensions(nsIEmbeddingSiteWindow *iface, - PRUint32 flags, PRInt32 x, PRInt32 y, PRInt32 cx, PRInt32 cy) + PRUint32 flags, LONG x, LONG y, LONG cx, LONG cy) { NSContainer *This = impl_from_nsIEmbeddingSiteWindow(iface); WARN("(%p)->(%08x %d %d %d %d)\n", This, flags, x, y, cx, cy); @@ -1675,7 +1675,7 @@ static nsresult NSAPI nsEmbeddingSiteWindow_SetDimensions(nsIEmbeddingSiteWindow } static nsresult NSAPI nsEmbeddingSiteWindow_GetDimensions(nsIEmbeddingSiteWindow *iface, - PRUint32 flags, PRInt32 *x, PRInt32 *y, PRInt32 *cx, PRInt32 *cy) + PRUint32 flags, LONG *x, LONG *y, LONG *cx, LONG *cy) { NSContainer *This = impl_from_nsIEmbeddingSiteWindow(iface); WARN("(%p)->(%08x %p %p %p %p)\n", This, flags, x, y, cx, cy); @@ -1778,7 +1778,7 @@ static nsrefcnt NSAPI nsTooltipListener_Release(nsITooltipListener *iface) } static nsresult NSAPI nsTooltipListener_OnShowTooltip(nsITooltipListener *iface, - PRInt32 aXCoord, PRInt32 aYCoord, const PRUnichar *aTipText) + LONG aXCoord, LONG aYCoord, const PRUnichar *aTipText) { NSContainer *This = impl_from_nsITooltipListener(iface); diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index ee29c58..13a156b 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -44,7 +44,6 @@ typedef nsIIDRef nsCIDRef; typedef WCHAR PRUnichar; typedef ULONG PRUint32; -typedef LONG PRInt32; typedef WORD PRUint16; typedef INT16 PRInt16; typedef BYTE PRUint8; @@ -57,7 +56,7 @@ typedef ULONGLONG PRUint64; * use stdint.h types in C. */ #define int16_t PRInt16 -#define int32_t PRInt32 +#define int32_t LONG #define int64_t PRInt64 #define uint8_t PRUint8 diff --git a/dlls/mshtml/nsservice.c b/dlls/mshtml/nsservice.c index 141ece1..2eefcbe 100644 --- a/dlls/mshtml/nsservice.c +++ b/dlls/mshtml/nsservice.c @@ -126,7 +126,7 @@ static nsresult NSAPI nsPromptService_ConfirmEx(nsIPromptService *iface, nsIDOMWindow *aParent, const PRUnichar *aDialogTitle, const PRUnichar *aText, PRUint32 aButtonFlags, const PRUnichar *aButton0Title, const PRUnichar *aButton1Title, const PRUnichar *aButton2Title, - const PRUnichar *aCheckMsg, cpp_bool *aCheckState, PRInt32 *_retval) + const PRUnichar *aCheckMsg, cpp_bool *aCheckState, LONG *_retval) { static const PRUnichar wszContinue[] = {'C','o','n','t','i','n','u','e',0}; @@ -186,7 +186,7 @@ static nsresult NSAPI nsPromptService_PromptPassword(nsIPromptService *iface, static nsresult NSAPI nsPromptService_Select(nsIPromptService *iface, nsIDOMWindow *aParent, const PRUnichar *aDialogTitle, const PRUnichar *aText, PRUint32 aCount, const PRUnichar **aSelectList, - PRInt32 *aOutSelection, cpp_bool *_retval) + LONG *aOutSelection, cpp_bool *_retval) { FIXME("(%p %s %s %d %p %p %p)\n", aParent, debugstr_w(aDialogTitle), debugstr_w(aText), aCount, aSelectList, aOutSelection, _retval); diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c index 9add1e6..db3b7b3 100644 --- a/dlls/mshtml/selection.c +++ b/dlls/mshtml/selection.c @@ -147,7 +147,7 @@ static HRESULT WINAPI HTMLSelectionObject_createRange(IHTMLSelectionObject *ifac TRACE("(%p)->(%p)\n", This, range); if(This->nsselection) { - PRInt32 nsrange_cnt = 0; + LONG nsrange_cnt = 0; nsresult nsres; nsISelection_GetRangeCount(This->nsselection, &nsrange_cnt); diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 86e9f0b..42e49b1 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -392,7 +392,7 @@ static nsIDOMNode *get_child_node(nsIDOMNode *node, PRUint32 off) static void get_cur_pos(HTMLTxtRange *This, BOOL start, dompos_t *pos) { nsIDOMNode *node; - PRInt32 off; + LONG off; pos->p = NULL;

1 0

Jacek Caban : mshtml: Get rid of PRInt16 type.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: f071d9b3c1931e8e25cf39db6136a39ceabf9f93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f071d9b3c1931e8e25cf39db6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 18 14:06:09 2013 +0100 mshtml: Get rid of PRInt16 type. --- dlls/mshtml/nsiface.idl | 3 +-- dlls/mshtml/txtrange.c | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 13a156b..8973701 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -45,7 +45,6 @@ typedef nsIIDRef nsCIDRef; typedef WCHAR PRUnichar; typedef ULONG PRUint32; typedef WORD PRUint16; -typedef INT16 PRInt16; typedef BYTE PRUint8; typedef LONGLONG PRInt64; typedef ULONGLONG PRUint64; @@ -55,7 +54,7 @@ typedef ULONGLONG PRUint64; * more similar to original declarations. Note that it's only a widl trick, we can't * use stdint.h types in C. */ -#define int16_t PRInt16 +#define int16_t short #define int32_t LONG #define int64_t PRInt64 diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 42e49b1..085aa84 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -1236,7 +1236,7 @@ static HRESULT WINAPI HTMLTxtRange_inRange(IHTMLTxtRange *iface, IHTMLTxtRange * { HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); HTMLTxtRange *src_range; - PRInt16 nsret = 0; + short nsret = 0; nsresult nsres; TRACE("(%p)->(%p %p)\n", This, Range, InRange); @@ -1267,7 +1267,7 @@ static HRESULT WINAPI HTMLTxtRange_isEqual(IHTMLTxtRange *iface, IHTMLTxtRange * { HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); HTMLTxtRange *src_range; - PRInt16 nsret = 0; + short nsret = 0; nsresult nsres; TRACE("(%p)->(%p %p)\n", This, Range, IsEqual); @@ -1599,7 +1599,7 @@ static HRESULT WINAPI HTMLTxtRange_compareEndPoints(IHTMLTxtRange *iface, BSTR h { HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); HTMLTxtRange *src_range; - PRInt16 nsret = 0; + short nsret = 0; int nscmpt; nsresult nsres;

1 0

Aric Stewart : usp10: MarkToMark calculations may need to happen even if the offset is 0.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: 6b8c910b37aa9b7d6f798157d8e2435d25c0079e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b8c910b37aa9b7d6f798157d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jan 18 07:13:20 2013 -0600 usp10: MarkToMark calculations may need to happen even if the offset is 0. --- dlls/usp10/opentype.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 3bec2d3..ca4050c 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1548,10 +1548,11 @@ static VOID GPOS_apply_MarkToLigature(const OT_LookupTable *look, const SCRIPT_A } } -static VOID GPOS_apply_MarkToMark(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, const WORD *glyphs, INT glyph_index, +static BOOL GPOS_apply_MarkToMark(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, const WORD *glyphs, INT glyph_index, INT glyph_count, INT ppem, LPPOINT pt) { int j; + BOOL rc = FALSE; int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; TRACE("MarkToMark Attachment Positioning Subtable\n"); @@ -1589,7 +1590,7 @@ static VOID GPOS_apply_MarkToMark(const OT_LookupTable *look, const SCRIPT_ANALY if (mark_index > GET_BE_WORD(ma->MarkCount)) { ERR("Mark index exeeded mark count\n"); - return; + return FALSE; } mr = &ma->MarkRecord[mark_index]; mark_class = GET_BE_WORD(mr->Class); @@ -1607,12 +1608,14 @@ static VOID GPOS_apply_MarkToMark(const OT_LookupTable *look, const SCRIPT_ANALY pt->x += mark2_pt.x - mark_pt.x; pt->y += mark2_pt.y - mark_pt.y; TRACE("Resulting cumulative offset is %i,%i design units\n",pt->x,pt->y); + rc = TRUE; } } } else FIXME("Unhandled Mark To Mark Format %i\n",GET_BE_WORD(mmpf1->PosFormat)); } + return rc; } static INT GPOS_apply_ChainContextPos(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, const SCRIPT_ANALYSIS *analysis, INT* piAdvance, @@ -1832,8 +1835,7 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, c double devX, devY; POINT desU = {0,0}; int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; - GPOS_apply_MarkToMark(look, analysis, glyphs, glyph_index, glyph_count, ppem, &desU); - if (desU.x || desU.y) + if (GPOS_apply_MarkToMark(look, analysis, glyphs, glyph_index, glyph_count, ppem, &desU)) { GPOS_convert_design_units_to_device(lpotm, lplogfont, desU.x, desU.y, &devX, &devY); if (analysis->fRTL && analysis->fLogicalOrder) devX *= -1;

1 0

Hans Leidekker : wmiutils: Add locking to the path object.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: 585dbbfc62122466121d95ef472b31ef21071a61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=585dbbfc62122466121d95ef4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 18 16:21:04 2013 +0100 wmiutils: Add locking to the path object. --- dlls/wmiutils/path.c | 147 +++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 116 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=585dbbfc62122466121d9…

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: a78b2b2e1f0c89ec247eccce410ff45a4a034c8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a78b2b2e1f0c89ec247eccce4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jan 18 17:06:38 2013 +0100 po: Update French translation. --- po/fr.po | 46 ++++++++++++++-------------------------------- 1 files changed, 14 insertions(+), 32 deletions(-) diff --git a/po/fr.po b/po/fr.po index 91cab2c..4b18035 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8316,17 +8316,13 @@ msgid "Don't install" msgstr "Ne pas installer" #: urlmon.rc:40 -#, fuzzy -#| msgid "" -#| "When installed, ActiveX has full access to your computer.Do not click " -#| "install unless you have absolute trust in the above source." msgid "" "When installed, an ActiveX component has full access to your computer. Do " "not click install unless you have absolute trust in the above source." msgstr "" -"Lorsqu'il est installé, ActiveX a un accès complet à votre ordinateur. Ne " -"cliquez pas sur le bouton d'installation à moins d'avoir une confiance " -"absolue dans la source ci-dessus." +"Lorsqu'il est installé, un composant ActiveX a un accès complet à votre " +"ordinateur. Ne cliquez pas sur le bouton d'installation à moins d'avoir une " +"confiance absolue dans la source ci-dessus." #: urlmon.rc:48 msgid "Installation of component failed: %08x" @@ -10316,10 +10312,8 @@ msgid "Connection-specific DNS suffix" msgstr "Suffixe DNS propre à la connexion" #: ipconfig.rc:33 -#, fuzzy -#| msgid "IP address" msgid "IPv4 address" -msgstr "Adresse IP" +msgstr "Adresse IPv4" #: ipconfig.rc:34 msgid "Hostname" @@ -10362,10 +10356,8 @@ msgid "Default gateway" msgstr "Passerelle par défaut" #: ipconfig.rc:47 -#, fuzzy -#| msgid "IP address" msgid "IPv6 address" -msgstr "Adresse IP" +msgstr "Adresse IPv6" #: net.rc:27 msgid "" @@ -10518,50 +10510,40 @@ msgid "State" msgstr "État" #: netstat.rc:32 -#, fuzzy -#| msgid "Interfaces" msgid "Interface Statistics" -msgstr "Interfaces" +msgstr "Statistiques de l'interface" #: netstat.rc:33 msgid "Sent" -msgstr "" +msgstr "Envoyés" #: netstat.rc:34 msgid "Received" -msgstr "" +msgstr "Reçus" #: netstat.rc:35 -#, fuzzy -#| msgid "bytes" msgid "Bytes" -msgstr "octets" +msgstr "Octets" #: netstat.rc:36 msgid "Unicast packets" -msgstr "" +msgstr "Paquets monodiffusion" #: netstat.rc:37 msgid "Non-unicast packets" -msgstr "" +msgstr "Paquets non monodiffusion" #: netstat.rc:38 -#, fuzzy -#| msgid "Disclaimer" msgid "Discards" -msgstr "Avis de non-responsabilité" +msgstr "Rejets" #: netstat.rc:39 -#, fuzzy -#| msgid "Error" msgid "Errors" -msgstr "Erreur" +msgstr "Erreurs" #: netstat.rc:40 -#, fuzzy -#| msgid "Unknown port.\n" msgid "Unknown protocols" -msgstr "Port inconnu.\n" +msgstr "Protocoles inconnus" #: notepad.rc:27 msgid "&New\tCtrl+N"

1 0

Henri Verbeet : ddraw: Avoid LPD3DEXECUTEDATA.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: f3e4cdb31a078ff71bc883f52c4438e92d0fe66b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3e4cdb31a078ff71bc883f52… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 18 12:05:22 2013 +0100 ddraw: Avoid LPD3DEXECUTEDATA. --- include/d3d.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 5db816b..692220a 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -889,8 +889,8 @@ DECLARE_INTERFACE_(IDirect3DExecuteBuffer,IUnknown) STDMETHOD(Initialize)(THIS_ struct IDirect3DDevice *device, D3DEXECUTEBUFFERDESC *desc) PURE; STDMETHOD(Lock)(THIS_ D3DEXECUTEBUFFERDESC *desc) PURE; STDMETHOD(Unlock)(THIS) PURE; - STDMETHOD(SetExecuteData)(THIS_ LPD3DEXECUTEDATA lpData) PURE; - STDMETHOD(GetExecuteData)(THIS_ LPD3DEXECUTEDATA lpData) PURE; + STDMETHOD(SetExecuteData)(THIS_ D3DEXECUTEDATA *data) PURE; + STDMETHOD(GetExecuteData)(THIS_ D3DEXECUTEDATA *data) PURE; STDMETHOD(Validate)(THIS_ LPDWORD lpdwOffset, LPD3DVALIDATECALLBACK lpFunc, LPVOID lpUserArg, DWORD dwReserved) PURE; STDMETHOD(Optimize)(THIS_ DWORD dwDummy) PURE; };

1 0

Henri Verbeet : wined3d: Introduce a separate function for intializing the adapter' s framebuffer configs.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: d183f118cfee34b6ebac67e5d704fb354b6802ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=d183f118cfee34b6ebac67e5d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 18 12:05:23 2013 +0100 wined3d: Introduce a separate function for intializing the adapter's framebuffer configs. --- dlls/wined3d/directx.c | 276 ++++++++++++++++++++++++------------------------ 1 files changed, 140 insertions(+), 136 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d183f118cfee34b6ebac6…

1 0

Henri Verbeet : wined3d: Replace InitAdapters() with a function to initialize a single adapter.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: c10c9fba76468148662c553b76c8bdedc70f6377 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c10c9fba76468148662c553b7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 18 12:05:24 2013 +0100 wined3d: Replace InitAdapters() with a function to initialize a single adapter. --- dlls/wined3d/directx.c | 124 +++++++++++++++++++++-------------------------- 1 files changed, 55 insertions(+), 69 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fb886da..7b388af 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5502,18 +5502,17 @@ static void wined3d_adapter_init_fb_cfgs(struct wined3d_adapter *adapter, HDC dc } /* Do not call while under the GL lock. */ -static BOOL InitAdapters(struct wined3d *wined3d) +static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal) { - struct wined3d_adapter *adapter = &wined3d->adapters[0]; struct wined3d_gl_info *gl_info = &adapter->gl_info; - BOOL ret; - int ps_selected_mode, vs_selected_mode; + struct wined3d_fake_gl_ctx fake_gl_ctx = {0}; + DISPLAY_DEVICEW display_device; - /* No need to hold any lock. The calling library makes sure only one thread calls - * wined3d simultaneously - */ + TRACE("adapter %p, ordinal %u.\n", adapter, ordinal); - TRACE("Initializing adapters\n"); + adapter->ordinal = ordinal; + adapter->monitorPoint.x = -1; + adapter->monitorPoint.y = -1; /* Dynamically load all GL core functions */ #ifdef USE_WIN32_OPENGL @@ -5539,74 +5538,58 @@ static BOOL InitAdapters(struct wined3d *wined3d) glEnableWINE = gl_info->gl_ops.gl.p_glEnable; glDisableWINE = gl_info->gl_ops.gl.p_glDisable; - /* For now only one default adapter */ + if (!AllocateLocallyUniqueId(&adapter->luid)) { - struct wined3d_fake_gl_ctx fake_gl_ctx = {0}; - DISPLAY_DEVICEW DisplayDevice; - - TRACE("Initializing default adapter\n"); - adapter->ordinal = 0; - adapter->monitorPoint.x = -1; - adapter->monitorPoint.y = -1; - - if (!AllocateLocallyUniqueId(&adapter->luid)) - { - DWORD err = GetLastError(); - ERR("Failed to set adapter LUID (%#x).\n", err); - return FALSE; - } - TRACE("Allocated LUID %08x:%08x for adapter.\n", - adapter->luid.HighPart, adapter->luid.LowPart); + ERR("Failed to set adapter LUID (%#x).\n", GetLastError()); + return FALSE; + } + TRACE("Allocated LUID %08x:%08x for adapter %p.\n", + adapter->luid.HighPart, adapter->luid.LowPart, adapter); - if (!WineD3D_CreateFakeGLContext(&fake_gl_ctx)) - { - ERR("Failed to get a gl context for default adapter\n"); - return FALSE; - } + if (!WineD3D_CreateFakeGLContext(&fake_gl_ctx)) + { + ERR("Failed to get a GL context for adapter %p.\n", adapter); + return FALSE; + } - ret = wined3d_adapter_init_gl_caps(adapter); - if(!ret) { - ERR("Failed to initialize gl caps for default adapter\n"); - WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); - return FALSE; - } + if (!wined3d_adapter_init_gl_caps(adapter)) + { + ERR("Failed to initialize GL caps for adapter %p.\n", adapter); + WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); + return FALSE; + } - wined3d_adapter_init_fb_cfgs(adapter, fake_gl_ctx.dc); - /* We haven't found any suitable formats. This should only happen in - * case of GDI software rendering, which is pretty useless anyway. */ - if (!adapter->cfg_count) - { - ERR("Disabling Direct3D because no hardware accelerated pixel formats have been found!\n"); - WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); - HeapFree(GetProcessHeap(), 0, adapter->cfgs); - return FALSE; - } + wined3d_adapter_init_fb_cfgs(adapter, fake_gl_ctx.dc); + /* We haven't found any suitable formats. This should only happen in + * case of GDI software rendering, which is pretty useless anyway. */ + if (!adapter->cfg_count) + { + WARN("No suitable pixel formats found.\n"); + WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); + HeapFree(GetProcessHeap(), 0, adapter->cfgs); + return FALSE; + } - ret = initPixelFormats(&adapter->gl_info, adapter->driver_info.vendor); - if(!ret) { - ERR("Failed to init gl formats\n"); - WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); - HeapFree(GetProcessHeap(), 0, adapter->cfgs); - return FALSE; - } + if (!initPixelFormats(&adapter->gl_info, adapter->driver_info.vendor)) + { + ERR("Failed to initialize GL format info.\n"); + WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); + HeapFree(GetProcessHeap(), 0, adapter->cfgs); + return FALSE; + } - adapter->TextureRam = adapter->driver_info.vidmem; - adapter->UsedTextureRam = 0; - TRACE("Emulating %dMB of texture ram\n", adapter->TextureRam/(1024*1024)); + adapter->TextureRam = adapter->driver_info.vidmem; + adapter->UsedTextureRam = 0; + TRACE("Emulating %u MB of texture ram.\n", adapter->TextureRam / (1024 * 1024)); - /* Initialize the Adapter's DeviceName which is required for ChangeDisplaySettings and friends */ - DisplayDevice.cb = sizeof(DisplayDevice); - EnumDisplayDevicesW(NULL, 0 /* Adapter 0 = iDevNum 0 */, &DisplayDevice, 0); - TRACE("DeviceName: %s\n", debugstr_w(DisplayDevice.DeviceName)); - strcpyW(adapter->DeviceName, DisplayDevice.DeviceName); + display_device.cb = sizeof(display_device); + EnumDisplayDevicesW(NULL, ordinal, &display_device, 0); + TRACE("DeviceName: %s\n", debugstr_w(display_device.DeviceName)); + strcpyW(adapter->DeviceName, display_device.DeviceName); - WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); + WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); - select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); - fillGLAttribFuncs(&adapter->gl_info); - } - wined3d->adapter_count = 1; - TRACE("%u adapters successfully initialized.\n", wined3d->adapter_count); + fillGLAttribFuncs(&adapter->gl_info); return TRUE; } @@ -5646,6 +5629,8 @@ HRESULT wined3d_init(struct wined3d *wined3d, UINT version, DWORD flags) wined3d->ref = 1; wined3d->flags = flags; + TRACE("Initializing adapters.\n"); + if (flags & WINED3D_NO3D) { wined3d_adapter_init_nogl(&wined3d->adapters[0], 0); @@ -5653,11 +5638,12 @@ HRESULT wined3d_init(struct wined3d *wined3d, UINT version, DWORD flags) return WINED3D_OK; } - if (!InitAdapters(wined3d)) + if (!wined3d_adapter_init(&wined3d->adapters[0], 0)) { - WARN("Failed to initialize adapters.\n"); + WARN("Failed to initialize adapter.\n"); return E_FAIL; } + wined3d->adapter_count = 1; return WINED3D_OK; }

1 0

Henri Verbeet : wined3d: Get rid of vs_selected_mode / ps_selected_mode from struct wined3d_device.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: e73aa3e83de5ba0abbe71be9fa45c6352e7e172a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e73aa3e83de5ba0abbe71be9f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 18 12:05:25 2013 +0100 wined3d: Get rid of vs_selected_mode / ps_selected_mode from struct wined3d_device. These are only used by wined3d_shader_create_vs() / wined3d_shader_create_ps(), but they're redundant there since the "none" shader backend doesn't support any shader version. --- dlls/wined3d/device.c | 1 - dlls/wined3d/shader.c | 6 ------ dlls/wined3d/wined3d_private.h | 3 --- 3 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 40ffe66..984fa3b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5652,7 +5652,6 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, for (i = 0; i < PATCHMAP_SIZE; ++i) list_init(&device->patches[i]); - select_shader_mode(&adapter->gl_info, &device->ps_selected_mode, &device->vs_selected_mode); device->shader_backend = adapter->shader_backend; device->shader_backend->shader_get_caps(&adapter->gl_info, &shader_caps); device->vs_version = shader_caps.vs_version; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d05615b..abbf837 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2341,9 +2341,6 @@ HRESULT CDECL wined3d_shader_create_ps(struct wined3d_device *device, const DWOR TRACE("device %p, byte_code %p, output_signature %p, parent %p, parent_ops %p, shader %p.\n", device, byte_code, output_signature, parent, parent_ops, shader); - if (device->ps_selected_mode == SHADER_NONE) - return WINED3DERR_INVALIDCALL; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { @@ -2375,9 +2372,6 @@ HRESULT CDECL wined3d_shader_create_vs(struct wined3d_device *device, const DWOR TRACE("device %p, byte_code %p, output_signature %p, parent %p, parent_ops %p, shader %p.\n", device, byte_code, output_signature, parent, parent_ops, shader); - if (device->vs_selected_mode == SHADER_NONE) - return WINED3DERR_INVALIDCALL; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index af5ad2f..8fbd16e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1705,9 +1705,6 @@ struct wined3d_device /* X and GL Information */ GLenum offscreenBuffer; - /* Selected capabilities */ - int vs_selected_mode; - int ps_selected_mode; const struct wined3d_shader_backend_ops *shader_backend; void *shader_priv; void *fragment_priv;

1 0

Piotr Caban : widl: Make it possible to set typelib resource id with id attribute.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: 3d9454bc8f514192735c6b37c28dcae7f77f667f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d9454bc8f514192735c6b37c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 18 12:40:20 2013 +0100 widl: Make it possible to set typelib resource id with id attribute. --- tools/widl/parser.y | 2 +- tools/widl/write_msft.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 9c2281f..d8435b9 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2057,7 +2057,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_HELPSTRINGCONTEXT */ { 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, "helpstringcontext" }, /* ATTR_HELPSTRINGDLL */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, "helpstringdll" }, /* ATTR_HIDDEN */ { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, "hidden" }, - /* ATTR_ID */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "id" }, + /* ATTR_ID */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, "id" }, /* ATTR_IDEMPOTENT */ { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "idempotent" }, /* ATTR_IGNORE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "ignore" }, /* ATTR_IIDIS */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, "iid_is" }, diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 918923b..53e1feb 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2547,7 +2547,12 @@ static void save_all_changes(msft_typelib_t *typelib) if (strendswith( typelib_name, ".res" )) /* create a binary resource file */ { - add_output_to_resources( "TYPELIB", "#1" ); + char typelib_id[13] = "#1"; + + expr_t *expr = get_attrp( typelib->typelib->attrs, ATTR_ID ); + if (expr) + sprintf( typelib_id, "#%d", expr->cval ); + add_output_to_resources( "TYPELIB", typelib_id ); output_typelib_regscript( typelib->typelib ); flush_output_resources( typelib_name ); }

1 0