wine-devel January 2008

wine-devel@winehq.org

126 participants
290 discussions

Re: dlls/msi/streams.c -- simplify and constify
by James Hawkins 17 Feb '08

17 Feb '08

On Nov 3, 2007 1:10 PM, Gerald Pfeifer <gerald(a)pfeifer.com> wrote: > While removing the dead code I noticed that we can actually also > strengthen the const-ness of this function. > > Gerald > > ChangeLog: > Remove a check which never could trigger (due to the domain of the > variable in question) and increase const-ness of STREAMS_CreateView(). > > Index: dlls/msi/streams.c > =================================================================== > RCS file: /home/wine/wine/dlls/msi/streams.c,v > retrieving revision 1.7 > diff -u -3 -p -r1.7 streams.c > --- dlls/msi/streams.c 18 Oct 2007 13:00:57 -0000 1.7 > +++ dlls/msi/streams.c 3 Nov 2007 18:06:27 -0000 > @@ -430,7 +430,7 @@ static UINT add_streams_to_table(MSISTRE > return count; > } > > -UINT STREAMS_CreateView(MSIDATABASE *db, MSIVIEW **view) > +UINT STREAMS_CreateView(const MSIDATABASE *db, MSIVIEW **view) > { > MSISTREAMSVIEW *sv; > > @@ -444,9 +444,6 @@ UINT STREAMS_CreateView(MSIDATABASE *db, > sv->db = db; > sv->num_rows = add_streams_to_table(sv); > > - if (sv->num_rows < 0) > - return ERROR_FUNCTION_FAILED; > - > *view = (MSIVIEW *)sv; > > return ERROR_SUCCESS; > This change is wrong. If you'd actually read what the code intended to do instead of just fixing warnings, you'd see that add_streams_to_table returns -1 on error. While the check for < 0 is not correct, removing the check entirely is wrong. The check should be if (sv->num_rows == -1) return ERROR_FUNCTION_FAILED. -- James Hawkins

2 2

Bugzilla: Remove obsolete components
by Austin English 09 Feb '08

09 Feb '08

Howdy, I just finished moving over the last of the obsolete components. _obsolete_binary, _obsolete_directx, and _obsolete_gui can all be removed now. -Austin

3 2

Re: RegOverridePredefKey stub
by Dmitry Timoshkov 06 Feb '08

06 Feb '08

"Jens Nestler" <nessi(a)nessi-online.de> wrote: > diff -urN wine-0.9.54_org/include/winreg.h wine-0.9.54/include/winreg.h > --- wine-0.9.54_org/include/winreg.h 2008-01-25 17:05:38.000000000 +0100 > +++ wine-0.9.54/include/winreg.h 2008-01-28 22:07:55.000000000 +0100 > @@ -131,6 +131,7 @@ > WINADVAPI LSTATUS WINAPI RegLoadKeyA(HKEY,LPCSTR,LPCSTR); > WINADVAPI LSTATUS WINAPI RegLoadKeyW(HKEY,LPCWSTR,LPCWSTR); > #define RegLoadKey WINELIB_NAME_AW(RegLoadKey) > +WINADVAPI LSTATUS WINAPI RegOverridePredefKey(HKEY,HKEY); > WINADVAPI LSTATUS WINAPI RegLoadMUIStringA(HKEY,LPCSTR,LPSTR,DWORD,LPDWORD,DWORD,LPCSTR); > WINADVAPI LSTATUS WINAPI RegLoadMUIStringW(HKEY,LPCWSTR,LPWSTR,DWORD,LPDWORD,DWORD,LPCWSTR); > #define RegLoadMUIString WINELIB_NAME_AW(RegLoadMUIString) Isn't there something that suggests that the entries are alphabetically sorted? -- Dmitry.

2 4

re: [Patch for Bug 8551] MoveFileWithProgressW unconditional fails for directories with flag MOVEFILE_REPLACE_EXISTING
by Dan Kegel 05 Feb '08

05 Feb '08

James McKenzie wrote: > Please submit a git diff not a UNIX diff. Now, hang on there. Jens submitted a perfectly good unified diff patch taken from the right directory. There is no reason to turn up our noses at it. It will apply using patch in exactly the same way as a diff generated by git. Jens, you're fine, I wouldn't bother rediffing. You might however resend your patch next week when Alexandre the maintainer is back from vacation! - Dan

2 1

comctl32 failures on Win95, Win98, NT4 asnd Win2K
by Reece Dunn 05 Feb '08

05 Feb '08

These tests are all failing consistently with identical failures on these platforms: combobox - 21 failures; all identical across the platforms. datetime - 2 failures; all identical across the platforms. The rebar tests have 146 failures on some (Win95 and NT4) and 545 failures on others (Win98 and Win2K). This looks like it is due to a different comctl32 version as a result of a different IE version. Several of the others have failures on Win95 and Win98 only. Is anyone going to look at these? - Reece

3 2

[Fwd: d3dx8: Implement D3DXCreateTextureFromFile]
by "Luis C. Busquets Pérez" 04 Feb '08

04 Feb '08

I have created a /dlls/d3dx8/texture.c file where to put all functions related to textures and d3dx8. I have included D3DXIMAGE_FILEFORMAT in the patch because it is referred by D3DXIMAGE_FILEFORMAT which is referred in the function. If not included, it would not compile. They both are now in /include/d3dx8.h whci I think is the appropiate file. Do you propose to put them elsewhere? Do you think I am missing anything or is it ok?

2 2

What's needed to make gdb work again?
by Maarten Lankhorst 01 Feb '08

01 Feb '08

Hi folks, I've been trying some debugging with kdbg (Graphical kde debugger), but it fails on wine because it can't attach to a process. While it is of course possible to use WINEDEBUG flags, I want to be able to use a full debugger, and not just deduce from logs what happened, but rather be able to see the corresponding lines of source as well. so would it be possible to make gdb work with winedbg again, and perhaps make it understand threads this time? Cheers, Maarten.

2 1

test.winehq.org
by Stefan Leichter 01 Feb '08

01 Feb '08

Hello, i just noticed that the test results for advapi32:service tests are not available for the last build (http://test.winehq.org/data/200801301937/). It looks like the parser did not create the files. Can someone familar with this stuff have a look? Thanks Stefan

4 4

Review comparing Wine and Vista for running games
by Dan Kegel 01 Feb '08

01 Feb '08

http://wastingtimewithmikeandari.wordpress.com/2008/01/31/linux-has-better-… It'd be nice if we ran those games properly, but still, at least we didn't lock the system.

3 2

Re: qmgr: Implement DLL server registration.
by Roderick Colenbrander 31 Jan '08

31 Jan '08

If possible you should do the registration in the same way as windows as we try to be like windows in every way. Depending on the dll the settings are either hardcoded in a dll (that's what most dlls do) or when it are default windows dlls the keys are stored in wine.inf. In case of your dll I guess it should be hardcoded. Shipping extra files puts an extra burden on packagers and it likely isn't what windows is doing. Regards, Roderick > I like the way Roy used a .INF file for the DLL server registration. > Looking > at some of the other DLL's code, this seems comparably like a very clean > idea. > > ChangeLog: > > Add the server registration code to qmgr. > > From: Roy Shea <roy at cs.hmc.edu> > Date: Thu Dec 20 18:38:31 CST 2007 > > --- > dlls/qmgr/Makefile.in | 4 ++- > dlls/qmgr/qmgr.h | 11 ++++++ > dlls/qmgr/qmgr.inf | 31 ++++++++++++++++ > dlls/qmgr/qmgr.spec | 4 +- > dlls/qmgr/qmgr_main.c | 92 > +++++++++++++++++++++++++++++++++++++++++++++++-- > dlls/qmgr/rsrc.rc | 20 +++++++++++ > 6 files changed, 156 insertions(+), 6 deletions(-) > create mode 100644 dlls/qmgr/qmgr.inf > create mode 100644 dlls/qmgr/rsrc.rc > > diff --git a/dlls/qmgr/Makefile.in b/dlls/qmgr/Makefile.in > index a19eea6..7159607 100644 > --- a/dlls/qmgr/Makefile.in > +++ b/dlls/qmgr/Makefile.in > @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. > SRCDIR = @srcdir@ > VPATH = @srcdir@ > MODULE = qmgr.dll > -IMPORTS = kernel32 > +IMPORTS = advpack kernel32 > EXTRALIBS = -luuid > > C_SRCS = \ > @@ -11,6 +11,8 @@ C_SRCS = \ > qmgr.c \ > qmgr_main.c > > +RC_SRCS = rsrc.rc > + > IDL_I_SRCS = qmgr_local.idl > > @MAKE_DLL_RULES@ > diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h > index 9b708c8..3ad314d 100644 > --- a/dlls/qmgr/qmgr.h > +++ b/dlls/qmgr/qmgr.h > @@ -27,6 +27,8 @@ > #define COBJMACROS > #include "bits.h" > > +#include <string.h> > + > /* Background copy manager vtbl and related data */ > typedef struct > { > @@ -43,4 +45,13 @@ extern ClassFactoryImpl BITS_ClassFactory; > > HRESULT BackgroundCopyManagerConstructor(IUnknown *pUnkOuter, LPVOID > *ppObj); > > +/* Little helper functions */ > +static inline char * > +qmgr_strdup(const char *s) > +{ > + size_t n = strlen(s) + 1; > + char *d = HeapAlloc(GetProcessHeap(), 0, n); > + return d ? memcpy(d, s, n) : NULL; > +} > + > #endif /* __QMGR_H__ */ > diff --git a/dlls/qmgr/qmgr.inf b/dlls/qmgr/qmgr.inf > new file mode 100644 > index 0000000..0550f01 > --- /dev/null > +++ b/dlls/qmgr/qmgr.inf > @@ -0,0 +1,31 @@ > +[version] > +Signature="$CHICAGO$" > + > + > +[Strings] > +Services="System\CurrentControlSet\Services" > + > + > +[RegisterDll] > +AddReg = Qmgr.Reg > + > + > +[UnregisterDll] > +DelReg = Qmgr.Reg > + > + > +[Qmgr.Reg] > + > +HKCR,"AppID\BITS","AppID",,"%CLSID_BackgroundCopyQMgr%" > +HKCR,"AppID\%CLSID_BackgroundCopyQMgr%","LocalService",,"BITS" > +HKCR,"CLSID\%CLSID_BackgroundCopyManager%","AppID",,"%CLSID_BackgroundCopyQMgr%" > + > +HKLM,"Software\Microsoft\Windows > NT\CurrentVersion\SvcHost","netsvcs",0x00010000,"BITS" > + > +HKLM,"%Services%\BITS","Type",0x00010001,00000110 > +HKLM,"%Services%\BITS","Start",0x00010001,00000003 > +HKLM,"%Services%\BITS","ErrorControl",0x00010001,00000001 > +HKLM,"%Services%\BITS","Description",,"BITS Service" > +HKLM,"%Services%\BITS","DispalyName",,"BITS" > +HKLM,"%Services%\BITS","ImagePath",0x00020000,"svchost.exe -k netsvcs" > +HKLM,"%Services%\BITS\Parameters","ServiceDll",0x00020000,"qmgr.dll" > diff --git a/dlls/qmgr/qmgr.spec b/dlls/qmgr/qmgr.spec > index 1a63b32..0f9b073 100644 > --- a/dlls/qmgr/qmgr.spec > +++ b/dlls/qmgr/qmgr.spec > @@ -1,2 +1,2 @@ > -@ stub DllRegisterServer > -@ stub DllUnregisterServer > +@ stdcall -private DllRegisterServer() > +@ stdcall -private DllUnregisterServer() > diff --git a/dlls/qmgr/qmgr_main.c b/dlls/qmgr/qmgr_main.c > index d00ac2d..2bb5258 100644 > --- a/dlls/qmgr/qmgr_main.c > +++ b/dlls/qmgr/qmgr_main.c > @@ -21,15 +21,27 @@ > * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, > USA > */ > > -#include <stdarg.h> > +#include <stdio.h> > > -#include "windef.h" > -#include "winbase.h" > +#include "objbase.h" > +#include "winuser.h" > +#include "winreg.h" > +#include "advpub.h" > + > +#include "bits.h" > +#include "qmgr.h" > +#include "initguid.h" > > #include "wine/debug.h" > > WINE_DEFAULT_DEBUG_CHANNEL(qmgr); > > +/* Handle to the base address of this DLL */ > +static HINSTANCE hInst; > + > +/* Other GUIDs used by this module */ > +DEFINE_GUID(CLSID_BackgroundCopyQMgr, 0x69AD4AEE, 0x51BE, 0x439b, > 0xA9,0x2C, 0x86,0xAE,0x49,0x0E,0x8B,0x30); > + > /* Entry point for DLL */ > BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID > lpvReserved) > { > @@ -41,6 +53,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, > LPVOID lpvReserved) > return FALSE; /* prefer native version */ > case DLL_PROCESS_ATTACH: > DisableThreadLibraryCalls(hinstDLL); > + hInst = hinstDLL; > break; > case DLL_PROCESS_DETACH: > break; > @@ -48,3 +61,76 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD > fdwReason, LPVOID lpvReserved) > > return TRUE; > } > + > +static HRESULT init_register_strtable(STRTABLEA *strtable) > +{ > + #define CLSID_EXPANSION_ENTRY(id) { "CLSID_" #id, &CLSID_ ## id } > + static const struct { > + const char *name; > + const CLSID *clsid; > + } expns[] = { > + CLSID_EXPANSION_ENTRY(BackgroundCopyQMgr), > + CLSID_EXPANSION_ENTRY(BackgroundCopyManager) > + }; > + #undef CLSID_EXPANSION_ENTRY > + static STRENTRYA pse[sizeof expns / sizeof expns[0]]; > + int i; > + > + strtable->cEntries = sizeof pse / sizeof pse[0]; > + strtable->pse = pse; > + for (i = 0; i < strtable->cEntries; i++) { > + static const char dummy_sample[] = > "{12345678-1234-1234-1234-123456789012}"; > + const CLSID *clsid = expns[i].clsid; > + pse[i].pszName = qmgr_strdup(expns[i].name); > + pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, sizeof > dummy_sample); > + if (!pse[i].pszName || !pse[i].pszValue) > + return E_OUTOFMEMORY; > + sprintf(pse[i].pszValue, > "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", > + clsid->Data1, clsid->Data2, clsid->Data3, > clsid->Data4[0], > + clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], > clsid->Data4[4], > + clsid->Data4[5], clsid->Data4[6], clsid->Data4[7]); > + } > + > + return S_OK; > +} > + > +static void cleanup_register_strtable(STRTABLEA *strtable) > +{ > + int i; > + for (i = 0; i < strtable->cEntries; i++) { > + HeapFree(GetProcessHeap(), 0, strtable->pse[i].pszName); > + HeapFree(GetProcessHeap(), 0, strtable->pse[i].pszValue); > + if (!strtable->pse[i].pszName || !strtable->pse[i].pszValue) > + return; > + } > +} > + > +/* Use an INF file to register or unregister the DLL */ > +static HRESULT register_server(BOOL do_register) > +{ > + HRESULT hr; > + STRTABLEA strtable; > + > + TRACE("(%x)\n", do_register); > + > + hr = init_register_strtable(&strtable); > + if (SUCCEEDED(hr)) > + hr = RegInstallA(hInst, do_register ? "RegisterDll" : > "UnregisterDll", > + &strtable); > + cleanup_register_strtable(&strtable); > + > + if (FAILED(hr)) > + ERR("failed: %08x\n", hr); > + > + return hr; > +} > + > +HRESULT WINAPI DllRegisterServer() > +{ > + return register_server(TRUE); > +} > + > +HRESULT WINAPI DllUnregisterServer() > +{ > + return register_server(FALSE); > +} > diff --git a/dlls/qmgr/rsrc.rc b/dlls/qmgr/rsrc.rc > new file mode 100644 > index 0000000..dfc64d0 > --- /dev/null > +++ b/dlls/qmgr/rsrc.rc > @@ -0,0 +1,20 @@ > +/* > + * Copyright 2007 Google (Roy Shea) > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, > USA > + */ > + > +/* @makedep: qmgr.inf */ > +REGINST REGINST qmgr.inf > -- Der GMX SmartSurfer hilft bis zu 70% Ihrer Onlinekosten zu sparen! Ideal für Modem und ISDN: http://www.gmx.net/de/go/smartsurfer

2 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel January 2008