wine-commits December 2010

wine-commits@winehq.org

2 participants
1099 discussions

Hans Leidekker : msi/tests: Avoid a test failure on 64-bit.
by Alexandre Julliard 09 Dec '10

09 Dec '10

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

Hans Leidekker : msi: Don' t try to install or remove ODBC drivers if the component is disabled.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: b376f41766301b3a52fd552658332efcc0b3fb2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b376f41766301b3a52fd55265… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 9 10:27:56 2010 +0100 msi: Don't try to install or remove ODBC drivers if the component is disabled. --- dlls/msi/action.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 78 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 15c04c9..2cccdc9 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5953,8 +5953,9 @@ static UINT ITERATE_InstallODBCDriver( MSIRECORD *rec, LPVOID param ) LPWSTR driver, driver_path, ptr; WCHAR outpath[MAX_PATH]; MSIFILE *driver_file = NULL, *setup_file = NULL; + MSICOMPONENT *comp; MSIRECORD *uirow; - LPCWSTR desc, file_key; + LPCWSTR desc, file_key, component; DWORD len, usage; UINT r = ERROR_SUCCESS; @@ -5965,6 +5966,17 @@ static UINT ITERATE_InstallODBCDriver( MSIRECORD *rec, LPVOID param ) static const WCHAR usage_fmt[] = { 'F','i','l','e','U','s','a','g','e','=','1',0}; + component = MSI_RecordGetString( rec, 2 ); + comp = get_loaded_component( package, component ); + if (!comp) + return ERROR_SUCCESS; + + if (!comp->Enabled) + { + TRACE("component is disabled\n"); + return ERROR_SUCCESS; + } + desc = MSI_RecordGetString(rec, 3); file_key = MSI_RecordGetString( rec, 4 ); @@ -6035,8 +6047,9 @@ static UINT ITERATE_InstallODBCTranslator( MSIRECORD *rec, LPVOID param ) LPWSTR translator, translator_path, ptr; WCHAR outpath[MAX_PATH]; MSIFILE *translator_file = NULL, *setup_file = NULL; + MSICOMPONENT *comp; MSIRECORD *uirow; - LPCWSTR desc, file_key; + LPCWSTR desc, file_key, component; DWORD len, usage; UINT r = ERROR_SUCCESS; @@ -6045,6 +6058,17 @@ static UINT ITERATE_InstallODBCTranslator( MSIRECORD *rec, LPVOID param ) static const WCHAR setup_fmt[] = { 'S','e','t','u','p','=','%','s',0}; + component = MSI_RecordGetString( rec, 2 ); + comp = get_loaded_component( package, component ); + if (!comp) + return ERROR_SUCCESS; + + if (!comp->Enabled) + { + TRACE("component is disabled\n"); + return ERROR_SUCCESS; + } + desc = MSI_RecordGetString(rec, 3); file_key = MSI_RecordGetString( rec, 4 ); @@ -6108,8 +6132,9 @@ static UINT ITERATE_InstallODBCTranslator( MSIRECORD *rec, LPVOID param ) static UINT ITERATE_InstallODBCDataSource( MSIRECORD *rec, LPVOID param ) { MSIPACKAGE *package = param; + MSICOMPONENT *comp; LPWSTR attrs; - LPCWSTR desc, driver; + LPCWSTR desc, driver, component; WORD request = ODBC_ADD_SYS_DSN; INT registration; DWORD len; @@ -6119,6 +6144,17 @@ static UINT ITERATE_InstallODBCDataSource( MSIRECORD *rec, LPVOID param ) static const WCHAR attrs_fmt[] = { 'D','S','N','=','%','s',0 }; + component = MSI_RecordGetString( rec, 2 ); + comp = get_loaded_component( package, component ); + if (!comp) + return ERROR_SUCCESS; + + if (!comp->Enabled) + { + TRACE("component is disabled\n"); + return ERROR_SUCCESS; + } + desc = MSI_RecordGetString(rec, 3); driver = MSI_RecordGetString(rec, 4); registration = MSI_RecordGetInteger(rec, 5); @@ -6196,9 +6232,21 @@ static UINT ACTION_InstallODBC( MSIPACKAGE *package ) static UINT ITERATE_RemoveODBCDriver( MSIRECORD *rec, LPVOID param ) { MSIPACKAGE *package = param; + MSICOMPONENT *comp; MSIRECORD *uirow; DWORD usage; - LPCWSTR desc; + LPCWSTR desc, component; + + component = MSI_RecordGetString( rec, 2 ); + comp = get_loaded_component( package, component ); + if (!comp) + return ERROR_SUCCESS; + + if (!comp->Enabled) + { + TRACE("component is disabled\n"); + return ERROR_SUCCESS; + } desc = MSI_RecordGetString( rec, 3 ); if (!SQLRemoveDriverW( desc, FALSE, &usage )) @@ -6222,9 +6270,21 @@ static UINT ITERATE_RemoveODBCDriver( MSIRECORD *rec, LPVOID param ) static UINT ITERATE_RemoveODBCTranslator( MSIRECORD *rec, LPVOID param ) { MSIPACKAGE *package = param; + MSICOMPONENT *comp; MSIRECORD *uirow; DWORD usage; - LPCWSTR desc; + LPCWSTR desc, component; + + component = MSI_RecordGetString( rec, 2 ); + comp = get_loaded_component( package, component ); + if (!comp) + return ERROR_SUCCESS; + + if (!comp->Enabled) + { + TRACE("component is disabled\n"); + return ERROR_SUCCESS; + } desc = MSI_RecordGetString( rec, 3 ); if (!SQLRemoveTranslatorW( desc, &usage )) @@ -6248,9 +6308,10 @@ static UINT ITERATE_RemoveODBCTranslator( MSIRECORD *rec, LPVOID param ) static UINT ITERATE_RemoveODBCDataSource( MSIRECORD *rec, LPVOID param ) { MSIPACKAGE *package = param; + MSICOMPONENT *comp; MSIRECORD *uirow; LPWSTR attrs; - LPCWSTR desc, driver; + LPCWSTR desc, driver, component; WORD request = ODBC_REMOVE_SYS_DSN; INT registration; DWORD len; @@ -6258,6 +6319,17 @@ static UINT ITERATE_RemoveODBCDataSource( MSIRECORD *rec, LPVOID param ) static const WCHAR attrs_fmt[] = { 'D','S','N','=','%','s',0 }; + component = MSI_RecordGetString( rec, 2 ); + comp = get_loaded_component( package, component ); + if (!comp) + return ERROR_SUCCESS; + + if (!comp->Enabled) + { + TRACE("component is disabled\n"); + return ERROR_SUCCESS; + } + desc = MSI_RecordGetString( rec, 3 ); driver = MSI_RecordGetString( rec, 4 ); registration = MSI_RecordGetInteger( rec, 5 );

1 0

Thomas Mullaly : urlmon: Added pluggable protocol support to CoInternetParseIUri.
by Alexandre Julliard 09 Dec '10

09 Dec '10

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

Stefan Leichter : ntoskrnl.exe: Add stub for IoWMIRegistrationControl.
by Alexandre Julliard 09 Dec '10

09 Dec '10

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

Andrew Bogott : winemenubuilder: Release property variants. Plugs a one-string memory leak.
by Alexandre Julliard 09 Dec '10

09 Dec '10

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

Henri Verbeet : wined3d: Pass an IWineD3DDeviceImpl pointer to free_private ().
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: 7f09eb6a7a7a8a285d0f90a8998bcc1fda32cdc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f09eb6a7a7a8a285d0f90a89… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 8 18:28:11 2010 +0100 wined3d: Pass an IWineD3DDeviceImpl pointer to free_private(). --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index eb0056f..7dc3c81 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6514,8 +6514,8 @@ static HRESULT arbfp_blit_alloc(IWineD3DDeviceImpl *device) } /* Context activation is done by the caller. */ -static void arbfp_blit_free(IWineD3DDevice *iface) { - IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) iface; +static void arbfp_blit_free(IWineD3DDeviceImpl *device) +{ const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct arbfp_blit_priv *priv = device->blit_priv; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 53b0c36..15b9020 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2050,7 +2050,7 @@ err_out: This->stateBlock = NULL; } if (This->blit_priv) { - This->blitter->free_private(iface); + This->blitter->free_private(This); } if (This->fragment_priv) { This->frag_pipe->free_private(This); @@ -2185,7 +2185,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, } /* Destroy the shader backend. Note that this has to happen after all shaders are destroyed. */ - This->blitter->free_private(iface); + This->blitter->free_private(This); This->frag_pipe->free_private(This); This->shader_backend->shader_free_private(This); @@ -6199,7 +6199,7 @@ static void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChainImpl } LEAVE_GL(); - This->blitter->free_private(iface); + This->blitter->free_private(This); This->frag_pipe->free_private(This); This->shader_backend->shader_free_private(This); destroy_dummy_textures(This, gl_info); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 05ce89b..994f3bc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4734,7 +4734,7 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = static HRESULT ffp_blit_alloc(IWineD3DDeviceImpl *device) { return WINED3D_OK; } /* Context activation is done by the caller. */ -static void ffp_blit_free(IWineD3DDevice *iface) { } +static void ffp_blit_free(IWineD3DDeviceImpl *device) { } /* This function is used in case of 8bit paletted textures using GL_EXT_paletted_texture */ /* Context activation is done by the caller. */ @@ -4871,7 +4871,7 @@ static HRESULT cpu_blit_alloc(IWineD3DDeviceImpl *device) } /* Context activation is done by the caller. */ -static void cpu_blit_free(IWineD3DDevice *iface) +static void cpu_blit_free(IWineD3DDeviceImpl *device) { } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a20a0ad..bb7b1f5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1176,7 +1176,7 @@ enum blit_operation struct blit_shader { HRESULT (*alloc_private)(IWineD3DDeviceImpl *device); - void (*free_private)(IWineD3DDevice *iface); + void (*free_private)(IWineD3DDeviceImpl *device); HRESULT (*set_shader)(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surface); void (*unset_shader)(IWineD3DDevice *iface); BOOL (*blit_supported)(const struct wined3d_gl_info *gl_info, enum blit_operation blit_op,

1 0

Henri Verbeet : wined3d: Pass an IWineD3DDeviceImpl pointer to alloc_private().
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: 4ba3b64c576302e7391902e85dac0dcbd3618d7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ba3b64c576302e7391902e85… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 8 18:28:10 2010 +0100 wined3d: Pass an IWineD3DDeviceImpl pointer to alloc_private(). --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e3b6e5d..eb0056f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6503,8 +6503,8 @@ struct arbfp_blit_priv { GLuint palette_texture; }; -static HRESULT arbfp_blit_alloc(IWineD3DDevice *iface) { - IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) iface; +static HRESULT arbfp_blit_alloc(IWineD3DDeviceImpl *device) +{ device->blit_priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct arbfp_blit_priv)); if(!device->blit_priv) { ERR("Out of memory\n"); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ec50693..53b0c36 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1973,7 +1973,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, TRACE("Fragment pipeline private data couldn't be allocated\n"); goto err_out; } - hr = This->blitter->alloc_private(iface); + hr = This->blitter->alloc_private(This); if(FAILED(hr)) { TRACE("Blitter private data couldn't be allocated\n"); goto err_out; @@ -6259,7 +6259,7 @@ static HRESULT create_primary_opengl_context(IWineD3DDevice *iface, IWineD3DSwap goto err; } - hr = This->blitter->alloc_private(iface); + hr = This->blitter->alloc_private(This); if (FAILED(hr)) { ERR("Failed to allocate blitter private data, hr %#x.\n", hr); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e10ed0c..05ce89b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4732,7 +4732,7 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = IWineD3DSurfaceImpl_DrawOverlay }; -static HRESULT ffp_blit_alloc(IWineD3DDevice *iface) { return WINED3D_OK; } +static HRESULT ffp_blit_alloc(IWineD3DDeviceImpl *device) { return WINED3D_OK; } /* Context activation is done by the caller. */ static void ffp_blit_free(IWineD3DDevice *iface) { } @@ -4865,7 +4865,7 @@ const struct blit_shader ffp_blit = { ffp_blit_color_fill }; -static HRESULT cpu_blit_alloc(IWineD3DDevice *iface) +static HRESULT cpu_blit_alloc(IWineD3DDeviceImpl *device) { return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ebcb4ea..a20a0ad 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1175,7 +1175,7 @@ enum blit_operation * already under the GL lock. */ struct blit_shader { - HRESULT (*alloc_private)(IWineD3DDevice *iface); + HRESULT (*alloc_private)(IWineD3DDeviceImpl *device); void (*free_private)(IWineD3DDevice *iface); HRESULT (*set_shader)(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surface); void (*unset_shader)(IWineD3DDevice *iface);

1 0

Henri Verbeet : wined3d: Remove IWineD3DBaseTexture::SetDirty() from the public interface.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: a3b2407824e364406d28403b1f64c61bdd3c037c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3b2407824e364406d28403b1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 8 18:28:09 2010 +0100 wined3d: Remove IWineD3DBaseTexture::SetDirty() from the public interface. --- dlls/wined3d/basetexture.c | 13 +++++++------ dlls/wined3d/cubetexture.c | 6 ------ dlls/wined3d/surface.c | 6 +++--- dlls/wined3d/texture.c | 6 ------ dlls/wined3d/volumetexture.c | 6 ------ dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.idl | 3 --- 7 files changed, 11 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 166584d..5047081 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -237,13 +237,14 @@ void basetexture_generate_mipmaps(IWineD3DBaseTexture *iface) FIXME("iface %p stub!\n", iface); } -BOOL basetexture_set_dirty(IWineD3DBaseTexture *iface, BOOL dirty) +BOOL basetexture_set_dirty(IWineD3DBaseTextureImpl *texture, BOOL dirty) { BOOL old; - IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; - old = This->baseTexture.texture_rgb.dirty || This->baseTexture.texture_srgb.dirty; - This->baseTexture.texture_rgb.dirty = dirty; - This->baseTexture.texture_srgb.dirty = dirty; + + old = texture->baseTexture.texture_rgb.dirty || texture->baseTexture.texture_srgb.dirty; + texture->baseTexture.texture_rgb.dirty = dirty; + texture->baseTexture.texture_srgb.dirty = dirty; + return old; } @@ -293,7 +294,7 @@ HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surfac gl_tex->states[WINED3DTEXSTA_MAXANISOTROPY] = 1; gl_tex->states[WINED3DTEXSTA_SRGBTEXTURE] = 0; gl_tex->states[WINED3DTEXSTA_SHADOW] = FALSE; - IWineD3DBaseTexture_SetDirty(iface, TRUE); + basetexture_set_dirty(This, TRUE); isNewTexture = TRUE; if(This->resource.usage & WINED3DUSAGE_AUTOGENMIPMAP) { diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index d2f2f19..5287e37 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -270,11 +270,6 @@ static void WINAPI IWineD3DCubeTextureImpl_GenerateMipSubLevels(IWineD3DCubeText basetexture_generate_mipmaps((IWineD3DBaseTexture *)iface); } -/* Internal function, No d3d mapping */ -static BOOL WINAPI IWineD3DCubeTextureImpl_SetDirty(IWineD3DCubeTexture *iface, BOOL dirty) { - return basetexture_set_dirty((IWineD3DBaseTexture *)iface, dirty); -} - /* Context activation is done by the caller. */ static HRESULT WINAPI IWineD3DCubeTextureImpl_BindTexture(IWineD3DCubeTexture *iface, BOOL srgb) { IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; @@ -434,7 +429,6 @@ static const IWineD3DCubeTextureVtbl IWineD3DCubeTexture_Vtbl = IWineD3DCubeTextureImpl_SetAutoGenFilterType, IWineD3DCubeTextureImpl_GetAutoGenFilterType, IWineD3DCubeTextureImpl_GenerateMipSubLevels, - IWineD3DCubeTextureImpl_SetDirty, IWineD3DCubeTextureImpl_BindTexture, IWineD3DCubeTextureImpl_IsCondNP2, /* IWineD3DCubeTexture */ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 91cc880..e10ed0c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -980,7 +980,7 @@ void surface_add_dirty_rect(IWineD3DSurfaceImpl *surface, const RECT *dirty_rect if (surface->container.type == WINED3D_CONTAINER_TEXTURE) { TRACE("Passing to container.\n"); - IWineD3DBaseTexture_SetDirty((IWineD3DBaseTexture *)surface->container.u.texture, TRUE); + basetexture_set_dirty(surface->container.u.texture, TRUE); } } @@ -4299,7 +4299,7 @@ void surface_modify_location(IWineD3DSurfaceImpl *surface, DWORD flag, BOOL pers if (surface->container.type == WINED3D_CONTAINER_TEXTURE) { TRACE("Passing to container.\n"); - IWineD3DBaseTexture_SetDirty((IWineD3DBaseTexture *)surface->container.u.texture, TRUE); + basetexture_set_dirty(surface->container.u.texture, TRUE); } } surface->flags &= ~SFLAG_LOCATIONS; @@ -4321,7 +4321,7 @@ void surface_modify_location(IWineD3DSurfaceImpl *surface, DWORD flag, BOOL pers if (surface->container.type == WINED3D_CONTAINER_TEXTURE) { TRACE("Passing to container\n"); - IWineD3DBaseTexture_SetDirty((IWineD3DBaseTexture *)surface->container.u.texture, TRUE); + basetexture_set_dirty(surface->container.u.texture, TRUE); } } surface->flags &= ~flag; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 9fe7280..e610846 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -261,11 +261,6 @@ static void WINAPI IWineD3DTextureImpl_GenerateMipSubLevels(IWineD3DTexture *ifa basetexture_generate_mipmaps((IWineD3DBaseTexture *)iface); } -/* Internal function, No d3d mapping */ -static BOOL WINAPI IWineD3DTextureImpl_SetDirty(IWineD3DTexture *iface, BOOL dirty) { - return basetexture_set_dirty((IWineD3DBaseTexture *)iface, dirty); -} - /* Context activation is done by the caller. */ static HRESULT WINAPI IWineD3DTextureImpl_BindTexture(IWineD3DTexture *iface, BOOL srgb) { IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; @@ -449,7 +444,6 @@ static const IWineD3DTextureVtbl IWineD3DTexture_Vtbl = IWineD3DTextureImpl_SetAutoGenFilterType, IWineD3DTextureImpl_GetAutoGenFilterType, IWineD3DTextureImpl_GenerateMipSubLevels, - IWineD3DTextureImpl_SetDirty, IWineD3DTextureImpl_BindTexture, IWineD3DTextureImpl_IsCondNP2, /* IWineD3DTexture */ diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 3d1a22b..0c61111 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -225,11 +225,6 @@ static void WINAPI IWineD3DVolumeTextureImpl_GenerateMipSubLevels(IWineD3DVolume basetexture_generate_mipmaps((IWineD3DBaseTexture *)iface); } -/* Internal function, No d3d mapping */ -static BOOL WINAPI IWineD3DVolumeTextureImpl_SetDirty(IWineD3DVolumeTexture *iface, BOOL dirty) { - return basetexture_set_dirty((IWineD3DBaseTexture *)iface, dirty); -} - /* Context activation is done by the caller. */ static HRESULT WINAPI IWineD3DVolumeTextureImpl_BindTexture(IWineD3DVolumeTexture *iface, BOOL srgb) { @@ -365,7 +360,6 @@ static const IWineD3DVolumeTextureVtbl IWineD3DVolumeTexture_Vtbl = IWineD3DVolumeTextureImpl_SetAutoGenFilterType, IWineD3DVolumeTextureImpl_GetAutoGenFilterType, IWineD3DVolumeTextureImpl_GenerateMipSubLevels, - IWineD3DVolumeTextureImpl_SetDirty, /* not in d3d */ IWineD3DVolumeTextureImpl_BindTexture, IWineD3DVolumeTextureImpl_IsCondNP2, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4b6b109..ebcb4ea 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1925,7 +1925,7 @@ HRESULT basetexture_init(IWineD3DBaseTextureImpl *texture, UINT layer_count, UIN const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; HRESULT basetexture_set_autogen_filter_type(IWineD3DBaseTexture *iface, WINED3DTEXTUREFILTERTYPE filter_type) DECLSPEC_HIDDEN; -BOOL basetexture_set_dirty(IWineD3DBaseTexture *iface, BOOL dirty) DECLSPEC_HIDDEN; +BOOL basetexture_set_dirty(IWineD3DBaseTextureImpl *texture, BOOL dirty) DECLSPEC_HIDDEN; DWORD basetexture_set_lod(IWineD3DBaseTexture *iface, DWORD new_lod) DECLSPEC_HIDDEN; void basetexture_unload(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 3b4fda4..45e4143 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2525,9 +2525,6 @@ interface IWineD3DBaseTexture : IWineD3DResource ); void GenerateMipSubLevels( ); - BOOL SetDirty( - BOOL dirty - ); HRESULT BindTexture( [in] BOOL srgb );

1 0

Henri Verbeet : wined3d: Remove the unused IWineD3DBaseTexture::GetDirty() method.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: 4dd3066ea3f96ab25ff86ebf3c54c489a88c551e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dd3066ea3f96ab25ff86ebf3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 8 18:28:08 2010 +0100 wined3d: Remove the unused IWineD3DBaseTexture::GetDirty() method. --- dlls/wined3d/basetexture.c | 6 ------ dlls/wined3d/cubetexture.c | 6 ------ dlls/wined3d/texture.c | 5 ----- dlls/wined3d/volumetexture.c | 5 ----- dlls/wined3d/wined3d_private.h | 1 - include/wine/wined3d.idl | 2 -- 6 files changed, 0 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 83f3797..166584d 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -247,12 +247,6 @@ BOOL basetexture_set_dirty(IWineD3DBaseTexture *iface, BOOL dirty) return old; } -BOOL basetexture_get_dirty(IWineD3DBaseTexture *iface) -{ - IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; - return This->baseTexture.texture_rgb.dirty || This->baseTexture.texture_srgb.dirty; -} - /* Context activation is done by the caller. */ HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surface_desc) { diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index d53f6cf..d2f2f19 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -275,11 +275,6 @@ static BOOL WINAPI IWineD3DCubeTextureImpl_SetDirty(IWineD3DCubeTexture *iface, return basetexture_set_dirty((IWineD3DBaseTexture *)iface, dirty); } -/* Internal function, No d3d mapping */ -static BOOL WINAPI IWineD3DCubeTextureImpl_GetDirty(IWineD3DCubeTexture *iface) { - return basetexture_get_dirty((IWineD3DBaseTexture *)iface); -} - /* Context activation is done by the caller. */ static HRESULT WINAPI IWineD3DCubeTextureImpl_BindTexture(IWineD3DCubeTexture *iface, BOOL srgb) { IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; @@ -440,7 +435,6 @@ static const IWineD3DCubeTextureVtbl IWineD3DCubeTexture_Vtbl = IWineD3DCubeTextureImpl_GetAutoGenFilterType, IWineD3DCubeTextureImpl_GenerateMipSubLevels, IWineD3DCubeTextureImpl_SetDirty, - IWineD3DCubeTextureImpl_GetDirty, IWineD3DCubeTextureImpl_BindTexture, IWineD3DCubeTextureImpl_IsCondNP2, /* IWineD3DCubeTexture */ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 915a55f..9fe7280 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -266,10 +266,6 @@ static BOOL WINAPI IWineD3DTextureImpl_SetDirty(IWineD3DTexture *iface, BOOL dir return basetexture_set_dirty((IWineD3DBaseTexture *)iface, dirty); } -static BOOL WINAPI IWineD3DTextureImpl_GetDirty(IWineD3DTexture *iface) { - return basetexture_get_dirty((IWineD3DBaseTexture *)iface); -} - /* Context activation is done by the caller. */ static HRESULT WINAPI IWineD3DTextureImpl_BindTexture(IWineD3DTexture *iface, BOOL srgb) { IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; @@ -454,7 +450,6 @@ static const IWineD3DTextureVtbl IWineD3DTexture_Vtbl = IWineD3DTextureImpl_GetAutoGenFilterType, IWineD3DTextureImpl_GenerateMipSubLevels, IWineD3DTextureImpl_SetDirty, - IWineD3DTextureImpl_GetDirty, IWineD3DTextureImpl_BindTexture, IWineD3DTextureImpl_IsCondNP2, /* IWineD3DTexture */ diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 99fa75f..3d1a22b 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -230,10 +230,6 @@ static BOOL WINAPI IWineD3DVolumeTextureImpl_SetDirty(IWineD3DVolumeTexture *ifa return basetexture_set_dirty((IWineD3DBaseTexture *)iface, dirty); } -static BOOL WINAPI IWineD3DVolumeTextureImpl_GetDirty(IWineD3DVolumeTexture *iface) { - return basetexture_get_dirty((IWineD3DBaseTexture *)iface); -} - /* Context activation is done by the caller. */ static HRESULT WINAPI IWineD3DVolumeTextureImpl_BindTexture(IWineD3DVolumeTexture *iface, BOOL srgb) { @@ -370,7 +366,6 @@ static const IWineD3DVolumeTextureVtbl IWineD3DVolumeTexture_Vtbl = IWineD3DVolumeTextureImpl_GetAutoGenFilterType, IWineD3DVolumeTextureImpl_GenerateMipSubLevels, IWineD3DVolumeTextureImpl_SetDirty, - IWineD3DVolumeTextureImpl_GetDirty, /* not in d3d */ IWineD3DVolumeTextureImpl_BindTexture, IWineD3DVolumeTextureImpl_IsCondNP2, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b21d617..4b6b109 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1915,7 +1915,6 @@ HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surfac void basetexture_cleanup(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; void basetexture_generate_mipmaps(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; -BOOL basetexture_get_dirty(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; DWORD basetexture_get_level_count(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; DWORD basetexture_get_lod(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; IWineD3DResourceImpl *basetexture_get_sub_resource(IWineD3DBaseTextureImpl *texture, diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 8876c3b..3b4fda4 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2528,8 +2528,6 @@ interface IWineD3DBaseTexture : IWineD3DResource BOOL SetDirty( BOOL dirty ); - BOOL GetDirty( - ); HRESULT BindTexture( [in] BOOL srgb );

1 0

Alexandre Julliard : rsaenh: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: 07a627b1b88aedd3f7de41726c5291dc021a9001 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07a627b1b88aedd3f7de41726… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 12:11:20 2010 +0100 rsaenh: Convert dll registration to the IRegistrar mechanism. --- dlls/rsaenh/Makefile.in | 2 +- dlls/rsaenh/rsaenh.c | 125 ++--------------------------------- dlls/rsaenh/rsaenh.rgs | 72 ++++++++++++++++++++ dlls/rsaenh/{version.rc => rsrc.rc} | 5 ++ 4 files changed, 84 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=07a627b1b88aedd3f7de4…

1 0

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-commits December 2010