January 2008 - Wine-Commits

Alexander Nicolaysen Sørnes : Fix distribution count in sidebar menu
by Chris Morgan Jan. 23, 2008

Jan. 23, 2008

Module: appdb Branch: master Commit: ecfc92a01f00aa74e10a74177cb832b1c12e8853 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=ecfc92a01f00aa74e10a7417… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jan 23 13:41:25 2008 +0100 Fix distribution count in sidebar menu --- include/sidebar.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/sidebar.php b/include/sidebar.php index dc748cf..bf7823c 100644 --- a/include/sidebar.php +++ b/include/sidebar.php @@ -29,8 +29,8 @@ function global_sidebar_menu() "sTitle=Submit+Application&sAction=add"); $g->add("Help & Documentation", BASE."help/"); $g->add("Statistics", BASE."appdbStats.php"); - $g->add("Distributions (".distribution::objectGetEntriesCount(false, false).")", BASE.'objectManager.php?sClass=distribution&sTitle=View%20Distributions'); - $g->add("Vendors (".vendor::objectGetEntriesCount(false, false).")", BASE.'objectManager.php?sClass=vendor&sTitle=View%20Vendors'); + $g->add('Distributions ('.distribution::objectGetEntriesCount('accepted').')', BASE.'objectManager.php?sClass=distribution&sTitle=View%20Distributions'); + $g->add('Vendors ('.vendor::objectGetEntriesCount('accepted').')', BASE.'objectManager.php?sClass=vendor&sTitle=View%20Vendors'); $g->add("Email your suggestions for improving the AppDB", "mailto:appdb(a)winehq.org"); $g->done();

1 0

Roy Shea : qmgr: Implement IClassFactory methods.
by Alexandre Julliard Jan. 23, 2008

Jan. 23, 2008

Module: wine Branch: master Commit: 807fc8c5433770e2ebc1d5f06e495eb998da0515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=807fc8c5433770e2ebc1d5f06… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Tue Jan 22 11:55:16 2008 -0800 qmgr: Implement IClassFactory methods. --- dlls/qmgr/Makefile.in | 1 + dlls/qmgr/factory.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/qmgr/qmgr.h | 7 ++++ 3 files changed, 104 insertions(+), 0 deletions(-) diff --git a/dlls/qmgr/Makefile.in b/dlls/qmgr/Makefile.in index 3a32cbe..a19eea6 100644 --- a/dlls/qmgr/Makefile.in +++ b/dlls/qmgr/Makefile.in @@ -7,6 +7,7 @@ IMPORTS = kernel32 EXTRALIBS = -luuid C_SRCS = \ + factory.c \ qmgr.c \ qmgr_main.c diff --git a/dlls/qmgr/factory.c b/dlls/qmgr/factory.c new file mode 100644 index 0000000..34c5ac0 --- /dev/null +++ b/dlls/qmgr/factory.c @@ -0,0 +1,96 @@ +/* + * Class factory interface for Queue Manager (BITS) + * + * Copyright (C) 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 + */ + +#define COBJMACROS + +#include "qmgr.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qmgr); + +static ULONG WINAPI +BITS_IClassFactory_AddRef(LPCLASSFACTORY iface) +{ + return 2; +} + +static HRESULT WINAPI +BITS_IClassFactory_QueryInterface(LPCLASSFACTORY iface, REFIID riid, + LPVOID *ppvObj) +{ + ClassFactoryImpl *This = (ClassFactoryImpl *) iface; + + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) + { + *ppvObj = &This->lpVtbl; + return S_OK; + } + + *ppvObj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI +BITS_IClassFactory_Release(LPCLASSFACTORY iface) +{ + return 1; +} + +static HRESULT WINAPI +BITS_IClassFactory_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pUnkOuter, + REFIID riid, LPVOID *ppvObj) +{ + HRESULT res; + IUnknown *punk = NULL; + + TRACE("IID: %s\n", debugstr_guid(riid)); + + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + res = BackgroundCopyManagerConstructor(pUnkOuter, (LPVOID*) &punk); + if (FAILED(res)) + return res; + + res = IUnknown_QueryInterface(punk, riid, ppvObj); + IUnknown_Release(punk); + return res; +} + +static HRESULT WINAPI +BITS_IClassFactory_LockServer(LPCLASSFACTORY iface, BOOL fLock) +{ + FIXME("Not implemented\n"); + return E_NOTIMPL; +} + +static const IClassFactoryVtbl BITS_IClassFactory_Vtbl = +{ + BITS_IClassFactory_QueryInterface, + BITS_IClassFactory_AddRef, + BITS_IClassFactory_Release, + BITS_IClassFactory_CreateInstance, + BITS_IClassFactory_LockServer +}; + +ClassFactoryImpl BITS_ClassFactory = +{ + &BITS_IClassFactory_Vtbl +}; diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index 0b821cb..9b708c8 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -34,6 +34,13 @@ typedef struct LONG ref; } BackgroundCopyManagerImpl; +typedef struct +{ + const IClassFactoryVtbl *lpVtbl; +} ClassFactoryImpl; + +extern ClassFactoryImpl BITS_ClassFactory; + HRESULT BackgroundCopyManagerConstructor(IUnknown *pUnkOuter, LPVOID *ppObj); #endif /* __QMGR_H__ */

1 0

Paul Vriens : user32/tests: Run full test again on win95 and NT4.
by Alexandre Julliard Jan. 23, 2008

Jan. 23, 2008

Module: wine Branch: master Commit: 7aaaad2110c3fb885f37edf34bc5afe8e5aa5f63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aaaad2110c3fb885f37edf34… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Jan 23 11:42:15 2008 +0100 user32/tests: Run full test again on win95 and NT4. --- dlls/user32/tests/msg.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index ea466af..280b972 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9584,6 +9584,12 @@ static void test_dbcs_wm_char(void) UINT i, j, k; struct message wmCharSeq[2]; + if (!pGetCPInfoExA) + { + skip("GetCPInfoExA is not available\n"); + return; + } + pGetCPInfoExA( CP_ACP, 0, &cpinfo ); if (cpinfo.MaxCharSize != 2) {

1 0

Kai Blin : gdi32: Fix spec file to export the right symbols for GetGlyphOutline.
by Alexandre Julliard Jan. 23, 2008

Jan. 23, 2008

Module: wine Branch: master Commit: a12f7069b0fad40a94dfc2c2c36a7f2cf5ad3cec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a12f7069b0fad40a94dfc2c2c… Author: Kai Blin <kai.blin(a)gmail.com> Date: Wed Jan 23 11:07:04 2008 +0100 gdi32: Fix spec file to export the right symbols for GetGlyphOutline. --- dlls/gdi32/gdi32.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 2d57ebb..2e79346 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -282,7 +282,7 @@ @ stdcall GetFontUnicodeRanges(ptr ptr) @ stdcall GetGlyphIndicesA(long ptr long ptr long) @ stdcall GetGlyphIndicesW(long ptr long ptr long) -@ stub GetGlyphOutline +@ stdcall GetGlyphOutline(long long long ptr long ptr ptr) GetGlyphOutlineA @ stdcall GetGlyphOutlineA(long long long ptr long ptr ptr) @ stdcall GetGlyphOutlineW(long long long ptr long ptr ptr) @ stub GetGlyphOutlineWow

1 0

Marcus Meissner : rpcrt4: Initialize CurrentHeader.
by Alexandre Julliard Jan. 23, 2008

Jan. 23, 2008

Module: wine Branch: master Commit: 20dcbc3de9186ee6dc2e972e98141990eeb0af43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20dcbc3de9186ee6dc2e972e9… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 23 07:58:30 2008 +0100 rpcrt4: Initialize CurrentHeader. --- dlls/rpcrt4/rpc_message.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 7cd6723..f56e3a4 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -806,7 +806,7 @@ RPC_STATUS RPCRT4_Receive(RpcConnection *Connection, RpcPktHdr **Header, unsigned long buffer_length; unsigned long auth_length; unsigned char *auth_data = NULL; - RpcPktHdr *CurrentHeader; + RpcPktHdr *CurrentHeader = NULL; void *payload = NULL; *Header = NULL;

1 0

Marcus Meissner : d3d9/tests: Initialize decl.
by Alexandre Julliard Jan. 23, 2008

Jan. 23, 2008

Module: wine Branch: master Commit: fc49a338bb6668bc77b369c24a5f111234d541a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc49a338bb6668bc77b369c24… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 23 08:27:12 2008 +0100 d3d9/tests: Initialize decl. --- dlls/d3d9/tests/device.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index ef62f83..8ad5d63 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1504,7 +1504,7 @@ static void test_null_stream(void) HWND hwnd; HRESULT hr; IDirect3DVertexShader9 *shader = NULL; - IDirect3DVertexDeclaration9 *decl; + IDirect3DVertexDeclaration9 *decl = NULL; DWORD shader_code[] = { 0xfffe0101, /* vs_1_1 */ 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ @@ -1544,8 +1544,16 @@ static void test_null_stream(void) } hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &decl); ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateVertexDeclaration failed (0x%08x)\n", hr); + if (!SUCCEEDED(hr)) { + skip("Vertex declaration handling not possible.\n"); + goto cleanup; + } hr = IDirect3DDevice9_CreateVertexBuffer(device, 12 * sizeof(float), 0, 0, D3DPOOL_MANAGED, &buffer, NULL); ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateVertexBuffer failed (0x%08x)\n", hr); + if (!SUCCEEDED(hr)) { + skip("Vertex buffer handling not possible.\n"); + goto cleanup; + } hr = IDirect3DDevice9_SetStreamSource(device, 0, buffer, 0, sizeof(float) * 3); ok(SUCCEEDED(hr), "IDirect3DDevice9_SetStreamSource failed (0x%08x)\n", hr); @@ -1570,7 +1578,7 @@ static void test_null_stream(void) IDirect3DDevice9_SetVertexShader(device, NULL); IDirect3DDevice9_SetVertexDeclaration(device, NULL); - cleanup: +cleanup: if(decl) IDirect3DVertexDeclaration9_Release(decl); if(shader) IDirect3DVertexShader9_Release(shader); if(device) IDirect3DDevice9_Release(device);

1 0

Eric Pouech : msvcrt: Corrected the . spec definition for the printf functions family.
by Alexandre Julliard Jan. 23, 2008

Jan. 23, 2008

Module: wine Branch: master Commit: 535f85e040a58a51b2c99213205e0e197c12e754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=535f85e040a58a51b2c992132… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jan 22 21:50:09 2008 +0100 msvcrt: Corrected the .spec definition for the printf functions family. --- dlls/msvcrt/msvcrt.spec | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 0877366..ce36fd5 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -445,8 +445,8 @@ @ cdecl _setmode(long long) @ stub _setsystime #(ptr long) @ cdecl _sleep(long) MSVCRT__sleep -@ varargs _snprintf(str long str) MSVCRT__snprintf -@ varargs _snwprintf(wstr long wstr) MSVCRT__snwprintf +@ varargs _snprintf(ptr long str) MSVCRT__snprintf +@ varargs _snwprintf(ptr long wstr) MSVCRT__snwprintf @ varargs _sopen(str long long) MSVCRT__sopen @ varargs _spawnl(long str str) @ varargs _spawnle(long str str) @@ -497,8 +497,8 @@ @ cdecl _unloaddll(long) @ cdecl _unlock(long) @ cdecl _utime(str ptr) -@ cdecl _vsnprintf(ptr long ptr ptr) MSVCRT_vsnprintf -@ cdecl _vsnwprintf(ptr long wstr long) MSVCRT_vsnwprintf +@ cdecl _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf +@ cdecl _vsnwprintf(ptr long wstr ptr) MSVCRT_vsnwprintf @ cdecl _waccess(wstr long) @ cdecl _wasctime(ptr) MSVCRT__wasctime @ cdecl _wchdir(wstr) @@ -734,7 +734,7 @@ @ cdecl strtol(str ptr long) ntdll.strtol @ cdecl strtoul(str ptr long) ntdll.strtoul @ cdecl strxfrm(ptr str long) MSVCRT_strxfrm -@ varargs swprintf(wstr wstr) MSVCRT_swprintf +@ varargs swprintf(ptr wstr) MSVCRT_swprintf @ varargs swscanf(wstr wstr) MSVCRT_swscanf @ cdecl system(str) MSVCRT_system @ cdecl tan(double) MSVCRT_tan @@ -748,12 +748,12 @@ @ cdecl towupper(long) ntdll.towupper @ cdecl ungetc(long ptr) MSVCRT_ungetc @ cdecl ungetwc(long ptr) MSVCRT_ungetwc -@ cdecl vfprintf(ptr str long) MSVCRT_vfprintf -@ cdecl vfwprintf(ptr wstr long) MSVCRT_vfwprintf -@ cdecl vprintf(str long) MSVCRT_vprintf +@ cdecl vfprintf(ptr str ptr) MSVCRT_vfprintf +@ cdecl vfwprintf(ptr wstr ptr) MSVCRT_vfwprintf +@ cdecl vprintf(str ptr) MSVCRT_vprintf @ cdecl vsprintf(ptr str ptr) MSVCRT_vsprintf -@ cdecl vswprintf(ptr wstr long) MSVCRT_vswprintf -@ cdecl vwprintf(wstr long) MSVCRT_vwprintf +@ cdecl vswprintf(ptr wstr ptr) MSVCRT_vswprintf +@ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf @ cdecl wcscat(wstr wstr) ntdll.wcscat @ cdecl wcschr(wstr long) ntdll.wcschr @ cdecl wcscmp(wstr wstr) ntdll.wcscmp

1 0

Paul Vriens : advapi32/tests: Make tests run on win9x/NT4 again.
by Alexandre Julliard Jan. 23, 2008

Jan. 23, 2008

Module: wine Branch: master Commit: 44273b00ed3e34f95581dad276648e680c4d7119 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44273b00ed3e34f95581dad27… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Jan 23 10:33:48 2008 +0100 advapi32/tests: Make tests run on win9x/NT4 again. --- dlls/advapi32/tests/service.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index fff5f24..38df62b 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -857,6 +857,8 @@ static void test_queryconfig2(void) static const CHAR password [] = ""; static const CHAR description [] = "Description"; HMODULE dllhandle = GetModuleHandleA("advapi32.dll"); + BOOL (WINAPI *pChangeServiceConfig2A)(SC_HANDLE,DWORD,LPVOID) + = (void*)GetProcAddress(dllhandle, "ChangeServiceConfig2A"); BOOL (WINAPI *pQueryServiceConfig2A)(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD) = (void*)GetProcAddress(dllhandle, "QueryServiceConfig2A"); BOOL (WINAPI *pQueryServiceConfig2W)(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD) @@ -957,8 +959,14 @@ static void test_queryconfig2(void) ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); ok(needed == sizeof(SERVICE_DESCRIPTIONA), "expected needed to be %d, got %d\n", sizeof(SERVICE_DESCRIPTIONA), needed); + if(!pChangeServiceConfig2A) + { + skip("function ChangeServiceConfig2A not present\n"); + goto cleanup; + } + pConfig->lpDescription = (LPSTR) description; - ret = ChangeServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION,buffer); + ret = pChangeServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION,buffer); ok(ret, "ChangeServiceConfig2A failed\n"); if (!ret) { goto cleanup;

1 0

Dmitry Timoshkov : winebuild: Add a couple of missing indentations in the generated asm files.
by Alexandre Julliard Jan. 23, 2008

Jan. 23, 2008

Module: wine Branch: master Commit: cf94095eb7fb8a10828354a381b7ff7776397f5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf94095eb7fb8a10828354a38… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jan 23 16:28:54 2008 +0800 winebuild: Add a couple of missing indentations in the generated asm files. --- tools/winebuild/spec16.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index dc86b1b..f5be830 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -461,7 +461,7 @@ static void output_init_code( const DLLSPEC *spec, const char *header_name ) output( "\t.align 4\n" ); output( "\t%s\n", func_declaration(name) ); output( "%s:\n", name ); - output( "subl $4,%%esp\n" ); + output( "\tsubl $4,%%esp\n" ); if (UsePIC) { output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); @@ -485,7 +485,7 @@ static void output_init_code( const DLLSPEC *spec, const char *header_name ) output( "\t.align 4\n" ); output( "\t%s\n", func_declaration(name) ); output( "%s:\n", name ); - output( "subl $8,%%esp\n" ); + output( "\tsubl $8,%%esp\n" ); if (UsePIC) { output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") );

1 0

Eric Pouech : regedit: Warn about newest unicode export from native regedit .
by Alexandre Julliard Jan. 23, 2008

Jan. 23, 2008

Module: wine Branch: master Commit: a6d85fe801dd42c5fbe5c3feaaf263fedf21ba9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6d85fe801dd42c5fbe5c3fea… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jan 22 21:53:42 2008 +0100 regedit: Warn about newest unicode export from native regedit. --- programs/regedit/regproc.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 705faf6..8b1507d 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -483,10 +483,19 @@ void processRegLines(FILE *in) { LPSTR line = NULL; /* line read from input stream */ ULONG lineSize = REG_VAL_BUF_SIZE; + BYTE uni[2]; line = HeapAlloc(GetProcessHeap(), 0, lineSize); CHECK_ENOUGH_MEMORY(line); + if (fread(uni, 2, 1, in) == 1) { + if (uni[0] == 0xff && uni[1] == 0xfe) { + printf("Trying to import from a unicode file: this isn't supported yet.\n" + "Please use export as Win 9x/NT4 files from native regedit\n"); + return; + } + fseek(in, -2, SEEK_CUR); + } while (!feof(in)) { LPSTR s; /* The pointer into line for where the current fgets should read */ s = line;

1 0