December 2010 - Wine-Commits

Hans Leidekker : msi/tests: Avoid a test failure on 64-bit.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: 973821c775cbc6c2bf8d03a6261b82c4ea5ea7d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=973821c775cbc6c2bf8d03a62… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 9 10:28:15 2010 +0100 msi/tests: Avoid a test failure on 64-bit. --- dlls/msi/tests/package.c | 45 +++++++++++++++++++++++++++------------------ 1 files changed, 27 insertions(+), 18 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index f026d95..7735d71 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -46,6 +46,7 @@ static LONG (WINAPI *pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static LONG (WINAPI *pRegDeleteKeyExW)(HKEY, LPCWSTR, REGSAM, DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static void (WINAPI *pGetSystemInfo)(LPSYSTEM_INFO); +static void (WINAPI *pGetNativeSystemInfo)(LPSYSTEM_INFO); static UINT (WINAPI *pGetSystemWow64DirectoryA)(LPSTR, UINT); static BOOL (WINAPI *pSRRemoveRestorePoint)(DWORD); @@ -72,6 +73,7 @@ static void init_functionpointers(void) GET_PROC(hadvapi32, RegDeleteKeyExA) GET_PROC(hadvapi32, RegDeleteKeyExW) GET_PROC(hkernel32, IsWow64Process) + GET_PROC(hkernel32, GetNativeSystemInfo) GET_PROC(hkernel32, GetSystemInfo) GET_PROC(hkernel32, GetSystemWow64DirectoryA) @@ -8283,6 +8285,7 @@ static void test_appsearch_reglocator(void) LPCSTR str; LONG res; UINT r, type = 0; + SYSTEM_INFO si; version = TRUE; if (!create_file_with_version("test.dll", MAKELONG(2, 1), MAKELONG(4, 3))) @@ -8726,28 +8729,34 @@ static void test_appsearch_reglocator(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, "#-42"), "Expected \"#-42\", got \"%s\"\n", prop); - size = ExpandEnvironmentStringsA("%PATH%", NULL, 0); - if (size == 0 && GetLastError() == ERROR_INVALID_PARAMETER) + memset(&si, 0, sizeof(si)); + if (pGetNativeSystemInfo) pGetNativeSystemInfo(&si); + + if (S(U(si)).wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) { - /* Workaround for Win95 */ - CHAR tempbuf[1]; - size = ExpandEnvironmentStringsA("%PATH%", tempbuf, 0); - } - pathvar = HeapAlloc(GetProcessHeap(), 0, size); - ExpandEnvironmentStringsA("%PATH%", pathvar, size); + size = ExpandEnvironmentStringsA("%PATH%", NULL, 0); + if (size == 0 && GetLastError() == ERROR_INVALID_PARAMETER) + { + /* Workaround for Win95 */ + CHAR tempbuf[1]; + size = ExpandEnvironmentStringsA("%PATH%", tempbuf, 0); + } + pathvar = HeapAlloc(GetProcessHeap(), 0, size); + ExpandEnvironmentStringsA("%PATH%", pathvar, size); - size = 0; - r = MsiGetPropertyA(hpkg, "SIGPROP4", NULL, &size); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + size = 0; + r = MsiGetPropertyA(hpkg, "SIGPROP4", NULL, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - pathdata = HeapAlloc(GetProcessHeap(), 0, ++size); - r = MsiGetPropertyA(hpkg, "SIGPROP4", pathdata, &size); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(pathdata, pathvar), - "Expected \"%s\", got \"%s\"\n", pathvar, pathdata); + pathdata = HeapAlloc(GetProcessHeap(), 0, ++size); + r = MsiGetPropertyA(hpkg, "SIGPROP4", pathdata, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(pathdata, pathvar), + "Expected \"%s\", got \"%s\"\n", pathvar, pathdata); - HeapFree(GetProcessHeap(), 0, pathvar); - HeapFree(GetProcessHeap(), 0, pathdata); + HeapFree(GetProcessHeap(), 0, pathvar); + HeapFree(GetProcessHeap(), 0, pathdata); + } size = MAX_PATH; r = MsiGetPropertyA(hpkg, "SIGPROP5", prop, &size);

1 0

Stefan Leichter : ntoskrnl.exe: Add stub for IoWMIRegistrationControl.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: f7192d329e005c92ddacd1e3e08da63e23466d6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7192d329e005c92ddacd1e3e… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Dec 8 23:17:24 2010 +0100 ntoskrnl.exe: Add stub for IoWMIRegistrationControl. --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d2c0340..a5c1659 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1550,6 +1550,15 @@ POWER_STATE WINAPI PoSetPowerState(PDEVICE_OBJECT DeviceObject, POWER_STATE_TYPE } /***************************************************** + * IoWMIRegistrationControl (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT DeviceObject, ULONG Action) +{ + FIXME("(%p %u ) stub\n", DeviceObject, Action); + return STATUS_SUCCESS; +} + +/***************************************************** * DllMain */ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 06976fd..ef0d50f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -485,7 +485,7 @@ @ stub IoWMIQueryAllDataMultiple @ stub IoWMIQuerySingleInstance @ stub IoWMIQuerySingleInstanceMultiple -@ stub IoWMIRegistrationControl +@ stdcall IoWMIRegistrationControl(ptr long) @ stub IoWMISetNotificationCallback @ stub IoWMISetSingleInstance @ stub IoWMISetSingleItem diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 950d93a..6df5290 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1111,6 +1111,7 @@ NTSTATUS WINAPI IoGetDeviceProperty(PDEVICE_OBJECT,DEVICE_REGISTRY_PROPERTY,ULO PVOID WINAPI IoGetDriverObjectExtension(PDRIVER_OBJECT,PVOID); PDEVICE_OBJECT WINAPI IoGetRelatedDeviceObject(PFILE_OBJECT); void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR); +NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT,ULONG); PKTHREAD WINAPI KeGetCurrentThread(void); void WINAPI KeQuerySystemTime(LARGE_INTEGER*);

1 0

Thomas Mullaly : urlmon: Added pluggable protocol support to CoInternetParseIUri.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: 4e1ff0b8cd8c973dab1bb739a09a212102573712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e1ff0b8cd8c973dab1bb739a… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Dec 8 21:28:46 2010 -0500 urlmon: Added pluggable protocol support to CoInternetParseIUri. --- dlls/urlmon/tests/uri.c | 53 +++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 41 +++++++++++++++--------------------- 2 files changed, 68 insertions(+), 26 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index c069d84..fd9099c 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -62,6 +62,7 @@ }while(0) DEFINE_EXPECT(CombineUrl); +DEFINE_EXPECT(ParseUrl); static HRESULT (WINAPI *pCreateUri)(LPCWSTR, DWORD, DWORD_PTR, IUri**); static HRESULT (WINAPI *pCreateUriWithFragment)(LPCWSTR, LPCWSTR, DWORD, DWORD_PTR, IUri**); @@ -83,6 +84,12 @@ static const WCHAR combine_resultW[] = {'z','i','p',':','t','e','s','t',0}; static const WCHAR winetestW[] = {'w','i','n','e','t','e','s','t',0}; +static const WCHAR parse_urlW[] = {'w','i','n','e','t','e','s','t',':','t','e','s','t',0}; +static const WCHAR parse_resultW[] = {'z','i','p',':','t','e','s','t',0}; + +static PARSEACTION parse_action; +static DWORD parse_flags; + typedef struct _uri_create_flag_test { DWORD flags; HRESULT expected; @@ -9300,8 +9307,17 @@ static HRESULT WINAPI InternetProtocolInfo_ParseUrl(IInternetProtocolInfo *iface PARSEACTION ParseAction, DWORD dwParseFlags, LPWSTR pwzResult, DWORD cchResult, DWORD *pcchResult, DWORD dwReserved) { - ok(0, "unexpected call %d\n", ParseAction); - return E_NOTIMPL; + CHECK_EXPECT(ParseUrl); + ok(!lstrcmpW(pwzUrl, parse_urlW), "Error: Expected %s, but got %s instead.\n", + wine_dbgstr_w(parse_urlW), wine_dbgstr_w(pwzUrl)); + ok(ParseAction == parse_action, "Error: Expected %d, but got %d.\n", parse_action, ParseAction); + ok(dwParseFlags == parse_flags, "Error: Expected 0x%08x, but got 0x%08x.\n", parse_flags, dwParseFlags); + ok(cchResult == 200, "Error: Got %d.\n", cchResult); + + memcpy(pwzResult, parse_resultW, sizeof(parse_resultW)); + *pcchResult = lstrlenW(parse_resultW); + + return S_OK; } static HRESULT WINAPI InternetProtocolInfo_CombineUrl(IInternetProtocolInfo *iface, @@ -9725,6 +9741,36 @@ static void test_CoInternetParseIUri(void) { } } +static void test_CoInternetParseIUri_Pluggable(void) { + HRESULT hr; + IUri *uri = NULL; + + hr = pCreateUri(parse_urlW, 0, 0, &uri); + ok(SUCCEEDED(hr), "Error: Expected CreateUri to succeed, but got 0x%08x.\n", hr); + if(SUCCEEDED(hr)) { + WCHAR result[200]; + DWORD result_len; + + SET_EXPECT(ParseUrl); + + parse_action = PARSE_CANONICALIZE; + parse_flags = URL_UNESCAPE|URL_ESCAPE_UNSAFE; + + hr = pCoInternetParseIUri(uri, parse_action, parse_flags, result, 200, &result_len, 0); + ok(hr == S_OK, "Error: CoInternetParseIUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK); + + CHECK_CALLED(ParseUrl); + + if(SUCCEEDED(hr)) { + ok(result_len == lstrlenW(parse_resultW), "Error: Expected %d, but got %d.\n", + lstrlenW(parse_resultW), result_len); + ok(!lstrcmpW(result, parse_resultW), "Error: Expected %s, but got %s.\n", + wine_dbgstr_w(parse_resultW), wine_dbgstr_w(result)); + } + } + if(uri) IUri_Release(uri); +} + START_TEST(uri) { HMODULE hurlmon; @@ -9831,5 +9877,8 @@ START_TEST(uri) { trace("test CoInternetCombineUrlEx Pluggable...\n"); test_CoInternetCombineUrlEx_Pluggable(); + trace("test CoInternetParseIUri pluggable...\n"); + test_CoInternetParseIUri_Pluggable(); + unregister_protocols(); } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 1cccfe3..681327f 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6203,6 +6203,7 @@ static HRESULT parse_canonicalize(const Uri *uri, DWORD flags, LPWSTR output, !(flags & URL_ESCAPE_SPACES_ONLY) && !(flags & URL_ESCAPE_PERCENT); + /* Check if the dot segments need to be removed from the * path component. */ @@ -6612,6 +6613,7 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d { HRESULT hr; Uri *uri; + IInternetProtocolInfo *info; TRACE("(%p %d %x %p %d %p %x)\n", pIUri, ParseAction, dwFlags, pwzResult, cchResult, pcchResult, (DWORD)dwReserved); @@ -6624,44 +6626,35 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d return E_INVALIDARG; } + if(!(uri = get_uri_obj(pIUri))) { + *pcchResult = 0; + FIXME("(%p %d %x %p %d %p %x) Unknown IUri's not supported for this action.\n", + pIUri, ParseAction, dwFlags, pwzResult, cchResult, pcchResult, (DWORD)dwReserved); + return E_NOTIMPL; + } + + info = get_protocol_info(uri->canon_uri); + if(info) { + hr = IInternetProtocolInfo_ParseUrl(info, uri->canon_uri, ParseAction, dwFlags, + pwzResult, cchResult, pcchResult, 0); + IInternetProtocolInfo_Release(info); + if(SUCCEEDED(hr)) return hr; + } + switch(ParseAction) { case PARSE_CANONICALIZE: - if(!(uri = get_uri_obj(pIUri))) { - *pcchResult = 0; - FIXME("(%p %d %x %p %d %p %x) Unknown IUri's not supported for this action.\n", - pIUri, ParseAction, dwFlags, pwzResult, cchResult, pcchResult, (DWORD)dwReserved); - return E_NOTIMPL; - } hr = parse_canonicalize(uri, dwFlags, pwzResult, cchResult, pcchResult); break; case PARSE_FRIENDLY: hr = parse_friendly(pIUri, pwzResult, cchResult, pcchResult); break; case PARSE_ROOTDOCUMENT: - if(!(uri = get_uri_obj(pIUri))) { - *pcchResult = 0; - FIXME("(%p %d %x %p %d %p %x) Unknown IUri's not supported for this action.\n", - pIUri, ParseAction, dwFlags, pwzResult, cchResult, pcchResult, (DWORD)dwReserved); - return E_NOTIMPL; - } hr = parse_rootdocument(uri, pwzResult, cchResult, pcchResult); break; case PARSE_DOCUMENT: - if(!(uri = get_uri_obj(pIUri))) { - *pcchResult = 0; - FIXME("(%p %d %x %p %d %p %x) Unknown IUri's not supported for this action.\n", - pIUri, ParseAction, dwFlags, pwzResult, cchResult, pcchResult, (DWORD)dwReserved); - return E_NOTIMPL; - } hr = parse_document(uri, pwzResult, cchResult, pcchResult); break; case PARSE_PATH_FROM_URL: - if(!(uri = get_uri_obj(pIUri))) { - *pcchResult = 0; - FIXME("(%p %d %x %p %d %p %x) Unknown IUri's not supported for this action.\n", - pIUri, ParseAction, dwFlags, pwzResult, cchResult, pcchResult, (DWORD)dwReserved); - return E_NOTIMPL; - } hr = parse_path_from_url(uri, pwzResult, cchResult, pcchResult); break; case PARSE_URL_FROM_PATH:

1 0

Francois Gouget : comctl32: Add a trailing '\n' to a FIXME() call.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: 320d8d2a52021cbf559a1ea1ecd345559ea35d20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=320d8d2a52021cbf559a1ea1e… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 9 12:00:43 2010 +0100 comctl32: Add a trailing '\n' to a FIXME() call. --- dlls/comctl32/progress.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index 1144b62..71fba9d 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -707,7 +707,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, case PBM_SETSTATE: if(wParam != PBST_NORMAL) - FIXME("state %04lx not yet handled", wParam); + FIXME("state %04lx not yet handled\n", wParam); return PBST_NORMAL; case PBM_GETSTATE:

1 0

Andrew Bogott : winemenubuilder: Release property variants. Plugs a one-string memory leak.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: 3b00ef9ebd7e7b0caf33271f24bc95c5b0a7b966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b00ef9ebd7e7b0caf33271f2… Author: Andrew Bogott <Andrew(a)CodeWeavers.com> Date: Wed Dec 8 12:20:36 2010 -0600 winemenubuilder: Release property variants. Plugs a one-string memory leak. --- programs/winemenubuilder/winemenubuilder.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 78d6bd6..af1aa56 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2692,6 +2692,8 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link icon_name = extract_icon( pv[0].pwszVal, pv[1].iVal, NULL, bWait ); WINE_TRACE("URL icon path: %s icon index: %d icon name: %s\n", wine_dbgstr_w(pv[0].pwszVal), pv[1].iVal, icon_name); + PropVariantClear(&pv[0]); + PropVariantClear(&pv[1]); } IPropertyStorage_Release(pPropStg); }

1 0

Alexandre Julliard : hnetcfg: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: c0be1ec8428590956214b3ff5f148fac4d4fc837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0be1ec8428590956214b3ff5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 11:47:19 2010 +0100 hnetcfg: Convert dll registration to the IRegistrar mechanism. --- dlls/hnetcfg/Makefile.in | 3 +- dlls/hnetcfg/hnetcfg.c | 20 ++ dlls/hnetcfg/hnetcfg.idl | 35 ++++ dlls/hnetcfg/regsvr.c | 430 ---------------------------------------------- 4 files changed, 57 insertions(+), 431 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0be1ec8428590956214b…

1 0

Alexandre Julliard : gameux: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: 71dbeb2ebe3434e9abe67d64f981fffdcb78a168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71dbeb2ebe3434e9abe67d64f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 11:33:09 2010 +0100 gameux: Convert dll registration to the IRegistrar mechanism. --- dlls/gameux/Makefile.in | 4 +- dlls/gameux/main.c | 20 ++ dlls/gameux/regsvr.c | 532 ----------------------------------------------- include/gameux.idl | 8 + 4 files changed, 30 insertions(+), 534 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71dbeb2ebe3434e9abe67…

1 0

Alexandre Julliard : gameux: Add a typelib resource.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: 092af1be3721d2f43638efc756ed3d0ba4396524 URL: http://source.winehq.org/git/wine.git/?a=commit;h=092af1be3721d2f43638efc75… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 11:18:11 2010 +0100 gameux: Add a typelib resource. --- .gitignore | 1 + dlls/gameux/Makefile.in | 4 +++- dlls/gameux/{version.rc => gameux_tlb.idl} | 14 +++----------- dlls/gameux/{version.rc => rsrc.rc} | 5 ++++- include/gameux.idl | 2 +- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 88001d8..36c11ee 100644 --- a/.gitignore +++ b/.gitignore @@ -50,6 +50,7 @@ dlls/d3dcompiler_43/asmshader.yy.c dlls/dispex/disp_ex.h dlls/dispex/disp_ex_p.c dlls/dxdiagn/fil_data.h +dlls/gameux/gameux_tlb.tlb dlls/infosoft/infosoft.h dlls/jscript/jsglobal.tlb dlls/jscript/parser.tab.c diff --git a/dlls/gameux/Makefile.in b/dlls/gameux/Makefile.in index d47c907..94cc810 100644 --- a/dlls/gameux/Makefile.in +++ b/dlls/gameux/Makefile.in @@ -9,6 +9,8 @@ C_SRCS = \ main.c \ regsvr.c -RC_SRCS = version.rc +IDL_TLB_SRCS = gameux_tlb.idl + +RC_SRCS = rsrc.rc @MAKE_DLL_RULES@ diff --git a/dlls/gameux/version.rc b/dlls/gameux/gameux_tlb.idl similarity index 63% copy from dlls/gameux/version.rc copy to dlls/gameux/gameux_tlb.idl index 286add1..8b18ca0 100644 --- a/dlls/gameux/version.rc +++ b/dlls/gameux/gameux_tlb.idl @@ -1,7 +1,7 @@ /* - * Gameux library version resource + * Typelib for gameux * - * Copyright (C) 2010 Mariusz Pluciński + * Copyright 2010 Alexandre Julliard * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,12 +18,4 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_FILEDESCRIPTION_STR "Wine Games Explorer" -#define WINE_FILENAME_STR "gameux.dll" -#define WINE_FILEVERSION 6,1,7600,16385 -#define WINE_FILEVERSION_STR "6.1.7600.16385" -#define WINE_PRODUCTVERSION 6,1,7600,16385 -#define WINE_PRODUCTVERSION_STR "6.1.7600.16385" -#define WINE_EXTRAVALUES VALUE "OLESelfRegister","" - -#include "wine/wine_common_ver.rc" +#include "gameux.idl" diff --git a/dlls/gameux/version.rc b/dlls/gameux/rsrc.rc similarity index 93% rename from dlls/gameux/version.rc rename to dlls/gameux/rsrc.rc index 286add1..f5670b7 100644 --- a/dlls/gameux/version.rc +++ b/dlls/gameux/rsrc.rc @@ -1,5 +1,5 @@ /* - * Gameux library version resource + * Gameux library resources * * Copyright (C) 2010 Mariusz Pluciński * @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* @makedep: gameux_tlb.tlb */ +1 TYPELIB gameux_tlb.tlb + #define WINE_FILEDESCRIPTION_STR "Wine Games Explorer" #define WINE_FILENAME_STR "gameux.dll" #define WINE_FILEVERSION 6,1,7600,16385 diff --git a/include/gameux.idl b/include/gameux.idl index 773e784..5c50a3c 100644 --- a/include/gameux.idl +++ b/include/gameux.idl @@ -24,7 +24,7 @@ import "ocidl.idl"; import "shobjidl.idl"; [ - uuid(1DE6CE3D-EA69-4671-941F-26F789F39C5B), + uuid(4F48A59C-942D-4F3C-83C9-4EFFE84E4959), version(1.0), helpstring("gameux public 1.0 Type Library") ]

1 0

Alexandre Julliard : wuapi: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: 69f58161b9e818341bd3ace0b7bfe26f4a5b1d93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69f58161b9e818341bd3ace0b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 10:34:19 2010 +0100 wuapi: Convert dll registration to the IRegistrar mechanism. --- dlls/wuapi/Makefile.in | 2 +- dlls/wuapi/main.c | 20 +++ dlls/wuapi/regsvr.c | 430 ------------------------------------------------ include/wuapi.idl | 21 ++- 4 files changed, 39 insertions(+), 434 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69f58161b9e818341bd3a…

1 0

Alexandre Julliard : wuapi: Add a typelib resource.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: 2f0371e84dfbb9e82fcda981b7197742576966a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f0371e84dfbb9e82fcda981b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 10:33:25 2010 +0100 wuapi: Add a typelib resource. --- .gitignore | 1 + dlls/wuapi/Makefile.in | 4 ++++ dlls/wuapi/rsrc.rc | 22 ++++++++++++++++++++++ dlls/wuapi/wuapi_tlb.idl | 21 +++++++++++++++++++++ include/wuapi.idl | 11 +++++++++++ 5 files changed, 59 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index a981f92..88001d8 100644 --- a/.gitignore +++ b/.gitignore @@ -145,6 +145,7 @@ dlls/urlmon/urlmon_urlmon.h dlls/urlmon/urlmon_urlmon_p.c dlls/windowscodecs/windowscodecs_wincodec.h dlls/windowscodecs/windowscodecs_wincodec_p.c +dlls/wuapi/wuapi_tlb.tlb include/activaut.h include/activdbg.h include/activscp.h diff --git a/dlls/wuapi/Makefile.in b/dlls/wuapi/Makefile.in index 658008a..563f611 100644 --- a/dlls/wuapi/Makefile.in +++ b/dlls/wuapi/Makefile.in @@ -11,4 +11,8 @@ C_SRCS = \ session.c \ updates.c +IDL_TLB_SRCS = wuapi_tlb.idl + +RC_SRCS = rsrc.rc + @MAKE_DLL_RULES@ diff --git a/dlls/wuapi/rsrc.rc b/dlls/wuapi/rsrc.rc new file mode 100644 index 0000000..9ddce3b --- /dev/null +++ b/dlls/wuapi/rsrc.rc @@ -0,0 +1,22 @@ +/* + * Resources for wuapi + * + * Copyright 2010 Alexandre Julliard + * + * 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: wuapi_tlb.tlb */ +1 TYPELIB wuapi_tlb.tlb diff --git a/dlls/wuapi/wuapi_tlb.idl b/dlls/wuapi/wuapi_tlb.idl new file mode 100644 index 0000000..120e364 --- /dev/null +++ b/dlls/wuapi/wuapi_tlb.idl @@ -0,0 +1,21 @@ +/* + * Typelib for wuapi + * + * Copyright 2010 Alexandre Julliard + * + * 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 + */ + +#include "wuapi.idl" diff --git a/include/wuapi.idl b/include/wuapi.idl index dd5da68..31ae49c 100644 --- a/include/wuapi.idl +++ b/include/wuapi.idl @@ -21,6 +21,15 @@ cpp_quote("DEFINE_GUID(CLSID_UpdateSession, 0x4cb43d7f,0x7eee,0x4906,0x86,0x98,0 import "oaidl.idl"; +[ + helpstring("WUAPI 2.0 Type Library"), + uuid(b596cc9f-56e5-419e-a622-e01bb457431e), + version(2.0) +] +library WUApiLib { + +importlib("stdole2.tlb"); + interface ICategoryCollection; interface IStringCollection; interface IUpdateCollection; @@ -1287,3 +1296,5 @@ interface IUpdateInstaller : IDispatch HRESULT RebootRequiredBeforeInstallation( [out, retval] VARIANT_BOOL *retval); } + +} /* WUApiLib */

1 0