December 2005 - Wine-commits

Vincent Béron : Add some missing includes which contain used prototypes.
by Alexandre Julliard 09 Dec '05

09 Dec '05

Module: wine Branch: refs/heads/master Commit: 834385cad48e6026e1ea9518e1ffcf2108b00b5c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=834385cad48e6026e1ea951… Author: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Date: Fri Dec 9 11:51:17 2005 +0100 Add some missing includes which contain used prototypes. --- dlls/mpr/mpr_main.c | 1 + dlls/shlwapi/regstream.c | 1 + dlls/user/mouse16.c | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mpr/mpr_main.c b/dlls/mpr/mpr_main.c index 49c4925..b944649 100644 --- a/dlls/mpr/mpr_main.c +++ b/dlls/mpr/mpr_main.c @@ -22,6 +22,7 @@ #include "windef.h" #include "winbase.h" +#include "objbase.h" #include "winnetwk.h" #include "wine/debug.h" #include "wnetpriv.h" diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index 50b6c45..b0f7117 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -29,6 +29,7 @@ #include "winbase.h" #include "objbase.h" #include "winreg.h" +#include "shlwapi.h" #include "wine/debug.h" diff --git a/dlls/user/mouse16.c b/dlls/user/mouse16.c index 3e5b180..510f2b6 100644 --- a/dlls/user/mouse16.c +++ b/dlls/user/mouse16.c @@ -25,6 +25,7 @@ #include "winbase.h" #include "winuser.h" #include "wine/winbase16.h" +#include "wine/winuser16.h" #include "pshpack1.h" typedef struct _MOUSEINFO

1 0

Jacek Caban : mshtml: Added nsIURIContentListener to QueryInterface.
by Alexandre Julliard 09 Dec '05

09 Dec '05

Module: wine Branch: refs/heads/master Commit: db452fdf7ce8201b5970d9337ca3f45576511e3d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=db452fdf7ce8201b5970d93… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 9 11:41:33 2005 +0100 mshtml: Added nsIURIContentListener to QueryInterface. Always release nsIWebBrowserSetup. --- dlls/mshtml/nsembed.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 3e7a04f..ffdfbb6 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -395,6 +395,9 @@ static nsresult NSAPI nsWebBrowserChrome }else if(IsEqualGUID(&IID_nsIContextMenuListener, riid)) { TRACE("(%p)->(IID_nsIContextMenuListener, %p)\n", This, result); *result = NSCML(This); + }else if(IsEqualGUID(&IID_nsIURIContentListener, riid)) { + TRACE("(%p)->(IID_nsIURIContentListener %p)\n", This, result); + *result = NSURICL(This); }else if(IsEqualGUID(&IID_nsIEmbeddingSiteWindow, riid)) { TRACE("(%p)->(IIS_nsIEmbeddingSiteWindow %p)\n", This, result); *result = NSEMBWNDS(This); @@ -895,9 +898,9 @@ void HTMLDocument_NSContainer_Init(HTMLD &IID_nsIWebBrowserSetup, (void**)&wbsetup); if(NS_SUCCEEDED(nsres)) { nsres = nsIWebBrowserSetup_SetProperty(wbsetup, SETUP_IS_CHROME_WRAPPER, TRUE); - if(NS_FAILED(nsres)) - ERR("SetProperty failed: %08lx\n", nsres); nsIWebBrowserSetup_Release(wbsetup); + if(NS_FAILED(nsres)) + ERR("SetProperty(SETUP_IS_CHROME_WRAPPER) failed: %08lx\n", nsres); }else { ERR("Could not get nsIWebBrowserSetup interface\n"); }

1 0

Jacek Caban : mshtml: Added PromptService implementation.
by Alexandre Julliard 09 Dec '05

09 Dec '05

Module: wine Branch: refs/heads/master Commit: 3fab5312d8e57901509f1568ba15622a979cb660 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3fab5312d8e57901509f156… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 9 11:51:02 2005 +0100 mshtml: Added PromptService implementation. --- dlls/mshtml/Makefile.in | 1 dlls/mshtml/mshtml_private.h | 2 dlls/mshtml/nsembed.c | 11 ++ dlls/mshtml/nsiface.idl | 66 ++++++++++ dlls/mshtml/nsservice.c | 276 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 356 insertions(+), 0 deletions(-) create mode 100644 dlls/mshtml/nsservice.c

1 0

Jacek Caban : mshtml: Added nsIEmbeddingSiteWindow implementation.
by Alexandre Julliard 09 Dec '05

09 Dec '05

Module: wine Branch: refs/heads/master Commit: 37b1a456d706b32be02117d40f6dd4edc8cb3bb9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=37b1a456d706b32be02117d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 9 11:23:58 2005 +0100 mshtml: Added nsIEmbeddingSiteWindow implementation. --- dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/nsembed.c | 109 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/nsiface.idl | 16 ++++++ 3 files changed, 127 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d3b42e6..457d5cf 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -80,6 +80,7 @@ struct NSContainer { const nsIWebBrowserChromeVtbl *lpWebBrowserChromeVtbl; const nsIContextMenuListenerVtbl *lpContextMenuListenerVtbl; const nsIURIContentListenerVtbl *lpURIContentListenerVtbl; + const nsIEmbeddingSiteWindowVtbl *lpEmbeddingSiteWindowVtbl; nsIWebBrowser *webbrowser; nsIWebNavigation *navigation; @@ -117,6 +118,7 @@ struct NSContainer { #define NSWBCHROME(x) ((nsIWebBrowserChrome*) &(x)->lpWebBrowserChromeVtbl) #define NSCML(x) ((nsIContextMenuListener*) &(x)->lpContextMenuListenerVtbl) #define NSURICL(x) ((nsIURIContentListener*) &(x)->lpURIContentListenerVtbl) +#define NSEMBWNDS(x) ((nsIEmbeddingSiteWindow*) &(x)->lpEmbeddingSiteWindowVtbl) #define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl))) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 6380c48..3e7a04f 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -395,6 +395,9 @@ static nsresult NSAPI nsWebBrowserChrome }else if(IsEqualGUID(&IID_nsIContextMenuListener, riid)) { TRACE("(%p)->(IID_nsIContextMenuListener, %p)\n", This, result); *result = NSCML(This); + }else if(IsEqualGUID(&IID_nsIEmbeddingSiteWindow, riid)) { + TRACE("(%p)->(IIS_nsIEmbeddingSiteWindow %p)\n", This, result); + *result = NSEMBWNDS(This); } if(*result) @@ -749,6 +752,111 @@ static const nsIURIContentListenerVtbl n nsURIContentListener_SetParentContentListener }; +/********************************************************** + * nsIEmbeddinSiteWindow interface + */ + +#define NSEMBWNDS_THIS(iface) DEFINE_THIS(NSContainer, EmbeddingSiteWindow, iface) + +static nsresult NSAPI nsEmbeddingSiteWindow_QueryInterface(nsIEmbeddingSiteWindow *iface, + nsIIDRef riid, nsQIResult result) +{ + NSContainer *This = NSEMBWNDS_THIS(iface); + return nsIWebBrowserChrome_QueryInterface(NSWBCHROME(This), riid, result); +} + +static nsrefcnt NSAPI nsEmbeddingSiteWindow_AddRef(nsIEmbeddingSiteWindow *iface) +{ + NSContainer *This = NSEMBWNDS_THIS(iface); + return nsIWebBrowserChrome_AddRef(NSWBCHROME(This)); +} + +static nsrefcnt NSAPI nsEmbeddingSiteWindow_Release(nsIEmbeddingSiteWindow *iface) +{ + NSContainer *This = NSEMBWNDS_THIS(iface); + return nsIWebBrowserChrome_Release(NSWBCHROME(This)); +} + +static nsresult NSAPI nsEmbeddingSiteWindow_SetDimensions(nsIEmbeddingSiteWindow *iface, + PRUint32 flags, PRInt32 x, PRInt32 y, PRInt32 cx, PRInt32 cy) +{ + NSContainer *This = NSEMBWNDS_THIS(iface); + WARN("(%p)->(%08lx %ld %ld %ld %ld)\n", This, flags, x, y, cx, cy); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult NSAPI nsEmbeddingSiteWindow_GetDimensions(nsIEmbeddingSiteWindow *iface, + PRUint32 flags, PRInt32 *x, PRInt32 *y, PRInt32 *cx, PRInt32 *cy) +{ + NSContainer *This = NSEMBWNDS_THIS(iface); + WARN("(%p)->(%08lx %p %p %p %p)\n", This, flags, x, y, cx, cy); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult NSAPI nsEmbeddingSiteWindow_SetFocus(nsIEmbeddingSiteWindow *iface) +{ + NSContainer *This = NSEMBWNDS_THIS(iface); + WARN("(%p)\n", This); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult NSAPI nsEmbeddingSiteWindow_GetVisibility(nsIEmbeddingSiteWindow *iface, + PRBool *aVisibility) +{ + NSContainer *This = NSEMBWNDS_THIS(iface); + WARN("(%p)->(%p)\n", This, aVisibility); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult NSAPI nsEmbeddingSiteWindow_SetVisibility(nsIEmbeddingSiteWindow *iface, + PRBool aVisibility) +{ + NSContainer *This = NSEMBWNDS_THIS(iface); + WARN("(%p)->(%x)\n", This, aVisibility); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult NSAPI nsEmbeddingSiteWindow_GetTitle(nsIEmbeddingSiteWindow *iface, + PRUnichar **aTitle) +{ + NSContainer *This = NSEMBWNDS_THIS(iface); + WARN("(%p)->(%p)\n", This, aTitle); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult NSAPI nsEmbeddingSiteWindow_SetTitle(nsIEmbeddingSiteWindow *iface, + const PRUnichar *aTitle) +{ + NSContainer *This = NSEMBWNDS_THIS(iface); + WARN("(%p)->(%s)\n", This, debugstr_w(aTitle)); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult NSAPI nsEmbeddingSiteWindow_GetSiteWindow(nsIEmbeddingSiteWindow *iface, + void **aSiteWindow) +{ + NSContainer *This = NSEMBWNDS_THIS(iface); + + TRACE("(%p)->(%p)\n", This, aSiteWindow); + + *aSiteWindow = This->hwnd; + return NS_OK; +} + +static const nsIEmbeddingSiteWindowVtbl nsEmbeddingSiteWindowVtbl = { + nsEmbeddingSiteWindow_QueryInterface, + nsEmbeddingSiteWindow_AddRef, + nsEmbeddingSiteWindow_Release, + nsEmbeddingSiteWindow_SetDimensions, + nsEmbeddingSiteWindow_GetDimensions, + nsEmbeddingSiteWindow_SetFocus, + nsEmbeddingSiteWindow_GetVisibility, + nsEmbeddingSiteWindow_SetVisibility, + nsEmbeddingSiteWindow_GetTitle, + nsEmbeddingSiteWindow_SetTitle, + nsEmbeddingSiteWindow_GetSiteWindow +}; + void HTMLDocument_NSContainer_Init(HTMLDocument *This) { nsIWebBrowserSetup *wbsetup; @@ -764,6 +872,7 @@ void HTMLDocument_NSContainer_Init(HTMLD This->nscontainer->lpWebBrowserChromeVtbl = &nsWebBrowserChromeVtbl; This->nscontainer->lpContextMenuListenerVtbl = &nsContextMenuListenerVtbl; This->nscontainer->lpURIContentListenerVtbl = &nsURIContentListenerVtbl; + This->nscontainer->lpEmbeddingSiteWindowVtbl = &nsEmbeddingSiteWindowVtbl; This->nscontainer->doc = This; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 1517ae6..dfdf4ee 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -433,3 +433,19 @@ interface nsIDOMMouseEvent : nsIDOMUIEve PRBool shiftKeyArg, PRBool metaKeyArg, PRUint16 buttonArg, nsIDOMEventTarget *relatedTargetArg); } + +[ + object, + uuid(3e5432cd-9568-4bd1-8cbe-d50aba110743) +] +interface nsIEmbeddingSiteWindow : nsISupports +{ + nsresult SetDimensions(PRUint32 flags, PRInt32 x, PRInt32 y, PRInt32 cx, PRInt32 cy); + nsresult GetDimensions(PRUint32 flags, PRInt32 *x, PRInt32 *y, PRInt32 *cx, PRInt32 *cy); + nsresult SetFocus(); + nsresult GetVisibility(PRBool *aVisibility); + nsresult SetVisibility(PRBool aVisibility); + nsresult GetTitle(PRUnichar **aTitle); + nsresult SetTitle(const PRUnichar *aTitle); + nsresult GetSiteWindow(void **aSiteWindow); +}

1 0

Oliver Stieber : wined3d: Vertex shader 8 support.
by Alexandre Julliard 09 Dec '05

09 Dec '05

Module: wine Branch: refs/heads/master Commit: 7c482cb9a1a3d7b694700dd00095f2434ed682d1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7c482cb9a1a3d7b694700dd… Author: Oliver Stieber <oliver_stieber(a)yahoo.co.uk> Date: Fri Dec 9 11:23:52 2005 +0100 wined3d: Vertex shader 8 support. Start to add support for DirectX 8 vertex shaders, constants and registers are now correctly assigned and loaded allowing support for most basic d3d8 shaders. --- dlls/d3d9/vertexshader.c | 2 - dlls/wined3d/device.c | 35 ++++++++++++- dlls/wined3d/drawprim.c | 80 +++++++++++++++++++++++++---- dlls/wined3d/vertexdeclaration.c | 106 +++++++++++++++++++++----------------- dlls/wined3d/vertexshader.c | 1 dlls/wined3d/wined3d_private.h | 11 +++- include/wine/wined3d_interface.h | 4 + include/wine/wined3d_types.h | 1 8 files changed, 175 insertions(+), 65 deletions(-)

1 0

Vincent Béron : Update win16.api and win32.api.
by Alexandre Julliard 09 Dec '05

09 Dec '05

Module: wine Branch: refs/heads/master Commit: 648cc6f435d3ffee30d224a927ff17eb3d57b874 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=648cc6f435d3ffee30d224a… Author: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Date: Fri Dec 9 11:22:32 2005 +0100 Update win16.api and win32.api. --- tools/winapi/win16.api | 5 ++++- tools/winapi/win32.api | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/winapi/win16.api b/tools/winapi/win16.api index c11b5b0..20bea75 100644 --- a/tools/winapi/win16.api +++ b/tools/winapi/win16.api @@ -1491,7 +1491,6 @@ u_long INT16 * LPWSADATA16 ULONG * -struct WS_in_addr struct WS_sockaddr * struct WS_timeval * ws_fd_set16 * @@ -1506,6 +1505,10 @@ SEGPTR LPCSTR char * +%unknown + +struct WS_in_addr + %void void diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 80020b9..2eb5979 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -1168,7 +1168,7 @@ GCP_RESULTSA * GCP_RESULTSW * GOBJENUMPROC HANDLETABLE * -ICMENUMPROCA +ICMENUMPROCA ICMENUMPROCW INT * LINEDDAPROC @@ -3062,6 +3062,10 @@ signed char unsigned int unsigned long +%long --pointer + +ULONG_PTR + %longlong CY

1 0

Thomas Weidenmueller : urlmon: Fix call to ReadFile.
by Alexandre Julliard 09 Dec '05

09 Dec '05

Module: wine Branch: refs/heads/master Commit: 38bfd5e6351801fb20ed41dd3e9a01f7b6b36909 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=38bfd5e6351801fb20ed41d… Author: Thomas Weidenmueller <wine-patches(a)reactsoft.com> Date: Fri Dec 9 11:22:59 2005 +0100 urlmon: Fix call to ReadFile. The BytesRead parameter passed to ReadFile may never be NULL. --- dlls/urlmon/umstream.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/umstream.c b/dlls/urlmon/umstream.c index f907317..720c8ba 100644 --- a/dlls/urlmon/umstream.c +++ b/dlls/urlmon/umstream.c @@ -225,6 +225,7 @@ static HRESULT WINAPI IStream_fnRead (IS ULONG cb, ULONG* pcbRead) { + DWORD dwBytesRead; IUMCacheStream *This = (IUMCacheStream *)iface; TRACE("(%p)->(%p,0x%08lx,%p)\n",This, pv, cb, pcbRead); @@ -232,7 +233,7 @@ static HRESULT WINAPI IStream_fnRead (IS if ( !pv ) return STG_E_INVALIDPOINTER; - if ( ! ReadFile( This->handle, pv, cb, pcbRead, NULL ) ) + if ( ! ReadFile( This->handle, pv, cb, (pcbRead ? pcbRead : &dwBytesRead), NULL ) ) return S_FALSE; if (!*pcbRead)

1 0

Alexander N. Sørnes : winecfg: Updated Norwegian Bokmaal resources.
by Alexandre Julliard 09 Dec '05

09 Dec '05

Module: wine Branch: refs/heads/master Commit: 3c7afa61a76ef85f3ebd72e294f6789c92648286 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3c7afa61a76ef85f3ebd72e… Author: Alexander N. Sørnes <alex(a)thehandofagony.com> Date: Fri Dec 9 11:21:35 2005 +0100 winecfg: Updated Norwegian Bokmaal resources. --- programs/winecfg/No.rc | 36 ++++++++++++++++-------------------- 1 files changed, 16 insertions(+), 20 deletions(-) diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index 7581b5f..7e49c4b 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -60,8 +60,6 @@ BEGIN CONTROL "Tillat DirectX-programmer � hindre musen fra � forlate vinduet",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8 CONTROL "Aktiver dobbelt hurtigminne for skrivebordet",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,230,8 - LTEXT "Du kan velge � emulere et Windows-skrivebord, s�nn at alle Windows-programmer samles i ett vindu, eller at Windows-programmer oppfrer seg som vanlige programmer.", - IDC_STATIC,15,73,228,28 LTEXT "Du kan velge � emulere et Windows-skrivebord, der alle vinduene er bundet i en virtuell skjerm, eller du kan f� vinduene til � oppf�re seg som andre programmer p� skrivebordet.", IDC_STATIC,15,73,228,28 LTEXT "Skrivebordsstrrelse:",IDC_DESKTOP_SIZE,15,115,44,8,WS_DISABLED @@ -154,29 +152,27 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Lyddriver: ",IDC_STATIC,10,20,60,8 COMBOBOX IDC_AUDIO_DRIVER,70,18,85,85,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Automatisk",IDC_AUDIO_AUTODETECT,170,20,49,14 - PUSHBUTTON "Konfigurer",IDC_AUDIO_CONFIGURE,170,40,49,14 - PUSHBUTTON "Kontrollpanel",IDC_AUDIO_CONTROL_PANEL,170,60,49,14 - - GROUPBOX " DirectSound ",IDC_STATIC,8,75,244,120 - - LTEXT "Maskinvareakselerasjon: ",IDC_STATIC,15,85,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,83,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Driveremulering",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10 - + PUSHBUTTON "Automatisk",IDC_AUDIO_AUTODETECT,170,20,59,14 + PUSHBUTTON "Oppsett",IDC_AUDIO_CONFIGURE,170,40,59,14 + PUSHBUTTON "Kontrollpanel",IDC_AUDIO_CONTROL_PANEL,170,60,59,14 + CONTROL "Enheter",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,40,150,160 + GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 + LTEXT "Maskinvareakselerasjon: ",IDC_STATIC,15,215,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Driveremulering",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 END IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Temaer ",IDC_STATIC,8,10,244,94 - LTEXT "Tema:",IDC_STATIC,15,22,228,8 - COMBOBOX IDC_THEME_THEMECOMBO,15,30,228,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Farge:",IDC_THEME_COLORTEXT,15,48,228,8 - COMBOBOX IDC_THEME_COLORCOMBO,15,56,228,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "St�rrelse:",IDC_THEME_SIZETEXT,15,74,228,8 - COMBOBOX IDC_THEME_SIZECOMBO,15,82,228,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +LTEXT "Tema:",IDC_STATIC,8,10,244,8 +COMBOBOX IDC_THEME_THEMECOMBO,8,18,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Installer tema . . .",IDC_THEME_INSTALL,152,32,100,14 + LTEXT "Farge:",IDC_THEME_COLORTEXT,8,48,244,8 + COMBOBOX IDC_THEME_COLORCOMBO,8,56,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "St�rrelse:",IDC_THEME_SIZETEXT,8,74,244,8 + COMBOBOX IDC_THEME_SIZECOMBO,8,82,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END STRINGTABLE DISCARDABLE @@ -193,7 +189,7 @@ BEGIN IDS_TAB_APPEARANCE "Utseende" IDS_TAB_AUDIO "Lyd" IDS_TAB_ABOUT "Om" - IDS_WINECFG_TITLE "Wine-konfigurasjon" + IDS_WINECFG_TITLE "Oppsett av Wine" IDS_THEMEFILE "Temafiler" IDS_THEMEFILE_SELECT "Velg en temafil" END

1 0

Thomas Weidenmueller : quartz: Fix incorrect usages of the HRESULT_FROM_WIN32 macro.
by Alexandre Julliard 09 Dec '05

09 Dec '05

Module: wine Branch: refs/heads/master Commit: 2b4377f5eb0a8b11484e4f053f9dbcf765c5a32d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2b4377f5eb0a8b11484e4f0… Author: Thomas Weidenmueller <w3seek(a)reactos.com> Date: Fri Dec 9 11:21:51 2005 +0100 quartz: Fix incorrect usages of the HRESULT_FROM_WIN32 macro. --- dlls/quartz/filesource.c | 4 ++ dlls/quartz/filtermapper.c | 78 ++++++++++++++++++++++++++++++-------------- 2 files changed, 57 insertions(+), 25 deletions(-)

1 0

Vincent Béron : widl: Issue correct C++ headers.
by Alexandre Julliard 09 Dec '05

09 Dec '05

Module: wine Branch: refs/heads/master Commit: fe987b303581740cb96231a9abc42987473451db URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fe987b303581740cb96231a… Author: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Date: Fri Dec 9 11:22:04 2005 +0100 widl: Issue correct C++ headers. --- tools/widl/header.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 88621f3..95db8c9 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -806,7 +806,7 @@ static void write_com_interface(type_t * fprintf(header, "#if defined(__cplusplus) && !defined(CINTERFACE)\n"); if (iface->ref) { - fprintf(header, "%s : public %s\n", iface->name, iface->ref->name); + fprintf(header, "interface %s : public %s\n", iface->name, iface->ref->name); fprintf(header, "{\n"); indentation++; write_cpp_method_def(iface); @@ -815,7 +815,7 @@ static void write_com_interface(type_t * } else { - fprintf(header, "%s\n", iface->name); + fprintf(header, "interface %s\n", iface->name); fprintf(header, "{\n"); fprintf(header, " BEGIN_INTERFACE\n"); fprintf(header, "\n"); @@ -888,7 +888,7 @@ void write_dispinterface(type_t *iface) write_forward(iface); /* C++ interface */ fprintf(header, "#if defined(__cplusplus) && !defined(CINTERFACE)\n"); - fprintf(header, "%s : public %s\n", iface->name, iface->ref->name); + fprintf(header, "interface %s : public %s\n", iface->name, iface->ref->name); fprintf(header, "{\n"); fprintf(header, "};\n"); fprintf(header, "#else\n");

1 0