November 2013 - Wine-Commits

Henri Verbeet : wined3d: Create surfaces inside wined3d.
by Alexandre Julliard Nov. 15, 2013

Nov. 15, 2013

Module: wine Branch: master Commit: afc3d2ab708f4fb645c28347b61f73d26abff267 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afc3d2ab708f4fb645c28347b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 15 08:24:31 2013 +0100 wined3d: Create surfaces inside wined3d. --- dlls/d3d10core/device.c | 19 +++++----- dlls/d3d8/d3d8_private.h | 5 +-- dlls/d3d8/device.c | 29 +++++----------- dlls/d3d8/surface.c | 30 +++-------------- dlls/d3d9/d3d9_private.h | 5 +-- dlls/d3d9/device.c | 29 +++++----------- dlls/d3d9/surface.c | 32 ++++------------- dlls/ddraw/ddraw.c | 72 +++++++++++++++------------------------- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/surface.c | 42 ++++++++++------------- dlls/wined3d/surface.c | 36 +++++++++++++------- dlls/wined3d/texture.c | 15 ++++---- dlls/wined3d/wined3d.spec | 1 - dlls/wined3d/wined3d_private.h | 4 ++ include/wine/wined3d.h | 9 +---- 15 files changed, 129 insertions(+), 201 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=afc3d2ab708f4fb645c28…

1 0

Frédéric Delanoy : itss: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 15, 2013

Nov. 15, 2013

Module: wine Branch: master Commit: 99e3ce7d430a730e152fdaba8d84515a733a70d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99e3ce7d430a730e152fdaba8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 15 02:44:43 2013 +0100 itss: Use BOOL type where appropriate. --- dlls/itss/chm_lib.c | 216 +++++++++++++++++++++++++------------------------- dlls/itss/chm_lib.h | 10 +- 2 files changed, 113 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=99e3ce7d430a730e152fd…

1 0

Francois Gouget : shlwapi/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Nov. 15, 2013

Nov. 15, 2013

Module: wine Branch: master Commit: 387289e547a07473db7305a3b5624bf3e2f4fd86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=387289e547a07473db7305a3b… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 15 02:35:26 2013 +0100 shlwapi/tests: Fix compilation on systems that don't support nameless unions. --- dlls/shlwapi/tests/istream.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 4421a78..bacd0e6 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -675,7 +675,7 @@ static void test_SHCreateStreamOnFileEx_CopyTo(void) ok(SUCCEEDED(ret), "SHCreateStreamOnFileEx failed with ret=0x%08x\n", ret); written.QuadPart = 0; - ret = IStream_Write(src, srcContents, sizeof(srcContents), &written.LowPart); + ret = IStream_Write(src, srcContents, sizeof(srcContents), &U(written).LowPart); ok(SUCCEEDED(ret), "ISequentialStream_Write failed with ret=0x%08x\n", ret); distance.QuadPart = 0; @@ -691,8 +691,8 @@ static void test_SHCreateStreamOnFileEx_CopyTo(void) ret = IStream_CopyTo(src, dst, count, &read, &written); ok(SUCCEEDED(ret), "CopyTo failed with ret=0x%08x\n", ret); - ok(read.QuadPart == 1, "read does not match size: %d != 1\n", read.LowPart); - ok(written.QuadPart == 1, "written does not match size: %d != 1\n", written.LowPart); + ok(read.QuadPart == 1, "read does not match size: %d != 1\n", U(read).LowPart); + ok(written.QuadPart == 1, "written does not match size: %d != 1\n", U(written).LowPart); IStream_Release(dst); IStream_Release(src);

1 0

Ken Thomases : winemac: Avoid moving owned windows when programmatically moving the owner.
by Alexandre Julliard Nov. 15, 2013

Nov. 15, 2013

Module: wine Branch: master Commit: 3a03dcf09733cddd2c5b70cfa956df9a5c12437b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a03dcf09733cddd2c5b70cfa… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Nov 14 20:52:07 2013 -0600 winemac: Avoid moving owned windows when programmatically moving the owner. Cocoa normally maintains the relative position of owned windows with respect to the owner, which differs from Windows. --- dlls/winemac.drv/cocoa_window.h | 1 + dlls/winemac.drv/cocoa_window.m | 32 ++++++++++++++++++++++++++------ 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index d9130ac..ba5e34f 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -64,6 +64,7 @@ NSTimeInterval enteredFullScreenTime; BOOL ignore_windowDeminiaturize; + BOOL ignore_windowResize; BOOL fakingClose; } diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index f7c2cd0..8b44fec 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1190,14 +1190,34 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif frame = [self frameRectForContentRect:contentRect]; if (!NSEqualRects(frame, oldFrame)) { - if (NSEqualSizes(frame.size, oldFrame.size)) - [self setFrameOrigin:frame.origin]; - else + BOOL equalSizes = NSEqualSizes(frame.size, oldFrame.size); + BOOL needEnableScreenUpdates = FALSE; + + if (equalSizes && [[self childWindows] count]) { - [self setFrame:frame display:YES]; - [self updateColorSpace]; + // If we change the window frame such that the origin moves + // but the size doesn't change, then Cocoa moves child + // windows with the parent. We don't want that so we fake + // a change of the size and then change it back. + NSRect bogusFrame = frame; + bogusFrame.size.width++; + + NSDisableScreenUpdates(); + needEnableScreenUpdates = TRUE; + + ignore_windowResize = TRUE; + [self setFrame:bogusFrame display:NO]; + ignore_windowResize = FALSE; } + [self setFrame:frame display:YES]; + + if (needEnableScreenUpdates) + NSEnableScreenUpdates(); + + if (!equalSizes) + [self updateColorSpace]; + if (!enteringFullScreen && [[NSProcessInfo processInfo] systemUptime] - enteredFullScreenTime > 1.0) nonFullscreenFrame = frame; @@ -1683,7 +1703,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif macdrv_event* event; NSRect frame = [self contentRectForFrameRect:[self frame]]; - if (exitingFullScreen) return; + if (ignore_windowResize || exitingFullScreen) return; if (self.disabled) {

1 0

Frédéric Delanoy : msgsm32.acm: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 15, 2013

Nov. 15, 2013

Module: wine Branch: master Commit: 157eae214f6203704f4f9dbe41288d20fc72a314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=157eae214f6203704f4f9dbe4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 15 02:44:44 2013 +0100 msgsm32.acm: Use BOOL type where appropriate. --- dlls/msgsm32.acm/msgsm32.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/msgsm32.acm/msgsm32.c b/dlls/msgsm32.acm/msgsm32.c index 5e7bce0..c32c656 100644 --- a/dlls/msgsm32.acm/msgsm32.c +++ b/dlls/msgsm32.acm/msgsm32.c @@ -61,13 +61,13 @@ FUNCPTR(gsm_decode); if((p##f = wine_dlsym(libgsm_handle, #f, NULL, 0)) == NULL) { \ wine_dlclose(libgsm_handle, NULL, 0); \ libgsm_handle = NULL; \ - return 0; \ + return FALSE; \ } /*********************************************************************** * GSM_drvLoad */ -static LRESULT GSM_drvLoad(void) +static BOOL GSM_drvLoad(void) { char error[128]; @@ -79,12 +79,12 @@ static LRESULT GSM_drvLoad(void) LOAD_FUNCPTR(gsm_option); LOAD_FUNCPTR(gsm_encode); LOAD_FUNCPTR(gsm_decode); - return 1; + return TRUE; } else { ERR("Couldn't load " SONAME_LIBGSM ": %s\n", error); - return 0; + return FALSE; } } @@ -137,10 +137,10 @@ static LRESULT GSM_DriverDetails(PACMDRIVERDETAILSW add) } /* Validate a WAVEFORMATEX structure */ -static DWORD GSM_FormatValidate(const WAVEFORMATEX *wfx) +static BOOL GSM_FormatValidate(const WAVEFORMATEX *wfx) { if (wfx->nChannels != 1) - return 0; + return FALSE; switch (wfx->wFormatTag) { @@ -148,54 +148,54 @@ static DWORD GSM_FormatValidate(const WAVEFORMATEX *wfx) if (wfx->wBitsPerSample != 16) { WARN("PCM wBitsPerSample %u\n", wfx->wBitsPerSample); - return 0; + return FALSE; } if (wfx->nBlockAlign != 2) { WARN("PCM nBlockAlign %u\n", wfx->nBlockAlign); - return 0; + return FALSE; } if (wfx->nAvgBytesPerSec != wfx->nBlockAlign * wfx->nSamplesPerSec) { WARN("PCM nAvgBytesPerSec %u/%u\n", wfx->nAvgBytesPerSec, wfx->nBlockAlign * wfx->nSamplesPerSec); - return 0; + return FALSE; } - return 1; + return TRUE; case WAVE_FORMAT_GSM610: if (wfx->cbSize < sizeof(WORD)) { WARN("GSM cbSize %u\n", wfx->cbSize); - return 0; + return FALSE; } if (wfx->wBitsPerSample != 0) { WARN("GSM wBitsPerSample %u\n", wfx->wBitsPerSample); - return 0; + return FALSE; } if (wfx->nBlockAlign != 65) { WARN("GSM nBlockAlign %u\n", wfx->nBlockAlign); - return 0; + return FALSE; } if (((const GSM610WAVEFORMAT*)wfx)->wSamplesPerBlock != 320) { WARN("GSM wSamplesPerBlock %u\n", ((const GSM610WAVEFORMAT*)wfx)->wSamplesPerBlock); - return 0; + return FALSE; } if (wfx->nAvgBytesPerSec != wfx->nSamplesPerSec * 65 / 320) { WARN("GSM nAvgBytesPerSec %d / %d\n", wfx->nAvgBytesPerSec, wfx->nSamplesPerSec * 65 / 320); - return 0; + return FALSE; } - return 1; + return TRUE; default: - return 0; + return FALSE; } - return 0; + return FALSE; } static const DWORD gsm_rates[] = { 8000, 11025, 22050, 44100, 48000, 96000 };

1 0

Dmitry Timoshkov : gdiplus: Slightly simplify write_path_types.
by Alexandre Julliard Nov. 15, 2013

Nov. 15, 2013

Module: wine Branch: master Commit: 4bca12c0db4c8ce56492afd1ed3ee64b77b8508c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bca12c0db4c8ce56492afd1e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 15 18:04:32 2013 +0900 gdiplus: Slightly simplify write_path_types. --- dlls/gdiplus/region.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 5d95fcd..759675a 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -702,14 +702,15 @@ static inline void write_packed_point(DWORD* location, INT* offset, static inline void write_path_types(DWORD* location, INT* offset, const GpPath* path) { + INT rounded_size = get_pathtypes_size(path); + memcpy(location + *offset, path->pathdata.Types, path->pathdata.Count); /* The unwritten parts of the DWORD (if any) must be cleared */ - if (path->pathdata.Count % sizeof(DWORD)) + if (rounded_size - path->pathdata.Count) ZeroMemory(((BYTE*)location) + (*offset * sizeof(DWORD)) + - path->pathdata.Count, - sizeof(DWORD) - path->pathdata.Count % sizeof(DWORD)); - *offset += (get_pathtypes_size(path) / sizeof(DWORD)); + path->pathdata.Count, rounded_size - path->pathdata.Count); + *offset += rounded_size / sizeof(DWORD); } static void write_element(const region_element* element, DWORD *buffer,

1 0

Jacek Caban : urlmon: Fixed protocol tests on IE10.
by Alexandre Julliard Nov. 15, 2013

Nov. 15, 2013

Module: wine Branch: master Commit: 1e83ca4dcdd0527c60f014fd0c9444c0a99cb9a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e83ca4dcdd0527c60f014fd0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 15 14:25:12 2013 +0100 urlmon: Fixed protocol tests on IE10. --- dlls/urlmon/protocol.c | 1 + dlls/urlmon/tests/protocol.c | 25 ++++++++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index 2682465..42ee8ed 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -516,6 +516,7 @@ HRESULT protocol_abort(Protocol *protocol, HRESULT reason) if(!protocol->protocol_sink) return S_OK; + /* NOTE: IE10 returns S_OK here */ if(protocol->flags & FLAG_RESULT_REPORTED) return INET_E_RESULT_DISPATCHED; diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 4728f3c..d4e9663 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -415,6 +415,18 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFG return IHttpSecurity_QueryInterface(&http_security, riid, ppv); } + if(IsEqualGUID(&IID_IGetBindHandle, guidService)) { + trace("QueryService(IID_IGetBindHandle)\n"); + *ppv = NULL; + return E_NOINTERFACE; + } + + if(IsEqualGUID(&IID_IWindowForBindingUI, guidService)) { + trace("QueryService(IID_IWindowForBindingUI)\n"); + *ppv = NULL; + return E_NOINTERFACE; + } + ok(0, "unexpected service %s\n", debugstr_guid(guidService)); return E_FAIL; } @@ -872,8 +884,11 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, CHECK_EXPECT(ReportProgress_DECODING); ok(!lstrcmpW(szStatusText, pjpegW), "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); break; + case BINDSTATUS_RESERVED_7: + trace("BINDSTATUS_RESERVED_7\n"); + break; default: - ok(0, "Unexpected status %d\n", ulStatusCode); + ok(0, "Unexpected status %d (%d)\n", ulStatusCode, ulStatusCode-BINDSTATUS_LAST); }; return S_OK; @@ -1232,6 +1247,7 @@ static IInternetProtocolSink mime_protocol_sink = { &mime_protocol_sink_vtbl }; static HRESULT QueryInterface(REFIID riid, void **ppv) { static const IID IID_undocumented = {0x58DFC7D0,0x5381,0x43E5,{0x9D,0x72,0x4C,0xDD,0xE4,0xCB,0x0F,0x1A}}; + static const IID IID_undocumentedIE10 = {0xc28722e5,0xbc1a,0x4c55,{0xa6,0x8d,0x33,0x21,0x9f,0x69,0x89,0x10}}; *ppv = NULL; @@ -1245,6 +1261,9 @@ static HRESULT QueryInterface(REFIID riid, void **ppv) /* NOTE: IE8 queries for undocumented {58DFC7D0-5381-43E5-9D72-4CDDE4CB0F1A} interface. */ if(IsEqualGUID(&IID_undocumented, riid)) return E_NOINTERFACE; + /* NOTE: IE10 queries for undocumented {c28722e5-bc1a-4c55-a68d-33219f698910} interface. */ + if(IsEqualGUID(&IID_undocumentedIE10, riid)) + return E_NOINTERFACE; if(*ppv) return S_OK; @@ -3070,7 +3089,7 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym CHECK_CALLED(ReportResult); hres = IInternetProtocol_Abort(async_protocol, E_ABORT, 0); - ok(hres == INET_E_RESULT_DISPATCHED, "Abort failed: %08x\n", hres); + ok(hres == INET_E_RESULT_DISPATCHED || hres == S_OK /* IE10 */, "Abort failed: %08x\n", hres); break; } }else { @@ -3093,7 +3112,7 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym CLEAR_CALLED(ReportProgress_COOKIE_SENT); hres = IInternetProtocol_Abort(async_protocol, E_ABORT, 0); - ok(hres == INET_E_RESULT_DISPATCHED, "Abort failed: %08x\n", hres); + ok(hres == INET_E_RESULT_DISPATCHED || hres == S_OK /* IE10 */, "Abort failed: %08x\n", hres); test_protocol_terminate(async_protocol);

1 0

Jacek Caban : urlmon: Fixed internet features tests on IE10.
by Alexandre Julliard Nov. 15, 2013

Nov. 15, 2013

Module: wine Branch: master Commit: 72edda27a15633ce73cbcfc80baec7d06a577435 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72edda27a15633ce73cbcfc80… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 15 13:33:13 2013 +0100 urlmon: Fixed internet features tests on IE10. --- dlls/urlmon/tests/misc.c | 87 +++++++++++++++++++++++++++++++--------------- 1 files changed, 59 insertions(+), 28 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index f0455ee..78d3448 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -23,6 +23,7 @@ #include <wine/test.h> #include <stdarg.h> #include <stddef.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" @@ -1730,6 +1731,8 @@ static void test_internet_feature_defaults(void) { * call hasn't already been made for the specified Feature). Because of * this we skip these tests on IE 7 and earlier. */ +static const char* szFeatureControlKey = "Software\\Microsoft\\Internet Explorer\\Main\\FeatureControl"; + static void test_internet_features_registry(void) { HRESULT hres; DWORD res; @@ -1739,9 +1742,7 @@ static void test_internet_features_registry(void) { HKEY feature; DWORD value, skip_zone; BOOL delete_feature_key = TRUE; - BOOL delete_feature_control_key = FALSE; - static const char* szFeatureControlKey = "Software\\Microsoft\\Internet Explorer\\Main\\FeatureControl"; static const char* szFeatureBehaviorsKey = "FEATURE_BEHAVIORS"; static const char* szFeatureZoneElevationKey = "FEATURE_ZONE_ELEVATION"; @@ -1757,17 +1758,13 @@ static void test_internet_features_registry(void) { /* Some Windows machines don't have a FeatureControl key in HKCU. */ res = RegOpenKeyA(HKEY_CURRENT_USER, szFeatureControlKey, &feature_control); - if(res != ERROR_SUCCESS) { - res = RegCreateKeyA(HKEY_CURRENT_USER, szFeatureControlKey, &feature_control); - ok(res == ERROR_SUCCESS, "RegCreateKey failed: %d\n", res); - delete_feature_control_key = TRUE; - } + ok(res == ERROR_SUCCESS, "RegCreateKey failed: %d\n", res); res = RegOpenKeyA(feature_control, szFeatureBehaviorsKey, &feature); - if(res == ERROR_SUCCESS) + if(res == ERROR_SUCCESS) { /* FEATURE_BEHAVIORS already existed, so don't delete it when we're done. */ delete_feature_key = FALSE; - else { + }else { res = RegCreateKeyA(feature_control, szFeatureBehaviorsKey, &feature); ok(res == ERROR_SUCCESS, "RegCreateKey failed: %d\n", res); } @@ -1796,8 +1793,6 @@ static void test_internet_features_registry(void) { ok(hres == S_OK, "CoInternetSetFeatureEnabled failed: %08x\n", hres); RegCloseKey(feature_control); - if(delete_feature_control_key) - RegDeleteKeyA(HKEY_CURRENT_USER, szFeatureControlKey); res = RegOpenKeyA(HKEY_LOCAL_MACHINE, szFeatureControlKey, &feature_control); ok(res == ERROR_SUCCESS, "RegOpenKey failed: %d\n", res); @@ -1891,11 +1886,40 @@ static void test_CoInternetSetFeatureEnabled(void) { } static void test_internet_features(void) { + HKEY key; + DWORD res; + if(!pCoInternetIsFeatureEnabled || !pCoInternetSetFeatureEnabled) { win_skip("Skipping internet feature tests, IE is too old\n"); return; } + /* IE10 takes FeatureControl key into account only if it's available upon process start. */ + res = RegOpenKeyA(HKEY_CURRENT_USER, szFeatureControlKey, &key); + if(res != ERROR_SUCCESS) { + PROCESS_INFORMATION pi; + STARTUPINFOA si = { 0 }; + char cmdline[MAX_PATH]; + char **argv; + BOOL ret; + + res = RegCreateKeyA(HKEY_CURRENT_USER, szFeatureControlKey, &key); + ok(res == ERROR_SUCCESS, "RegCreateKey failed: %d\n", res); + + trace("Running features tests in a separated process.\n"); + + winetest_get_mainargs( &argv ); + sprintf(cmdline, "\"%s\" %s internet_features", argv[0], argv[1]); + ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "Could not create process: %u\n", GetLastError()); + winetest_wait_child_process( pi.hProcess ); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + RegDeleteKeyA(HKEY_CURRENT_USER, szFeatureControlKey); + return; + } + test_internet_features_registry(); test_CoInternetIsFeatureEnabled(); test_CoInternetSetFeatureEnabled(); @@ -1904,6 +1928,10 @@ static void test_internet_features(void) { START_TEST(misc) { HMODULE hurlmon; + int argc; + char **argv; + + argc = winetest_get_mainargs(&argv); hurlmon = GetModuleHandleA("urlmon.dll"); pCoInternetCompareUrl = (void *) GetProcAddress(hurlmon, "CoInternetCompareUrl"); @@ -1930,23 +1958,26 @@ START_TEST(misc) OleInitialize(NULL); - register_protocols(); - - test_CreateFormatEnum(); - test_RegisterFormatEnumerator(); - test_CoInternetParseUrl(); - test_CoInternetCompareUrl(); - test_CoInternetQueryInfo(); - test_FindMimeFromData(); - test_NameSpace(); - test_MimeFilter(); - test_ReleaseBindInfo(); - test_CopyStgMedium(); - test_CopyBindInfo(); - test_UrlMkGetSessionOption(); - test_user_agent(); - test_MkParseDisplayNameEx(); - test_IsValidURL(); + if(argc <= 2 || strcmp(argv[2], "internet_features")) { + register_protocols(); + + test_CreateFormatEnum(); + test_RegisterFormatEnumerator(); + test_CoInternetParseUrl(); + test_CoInternetCompareUrl(); + test_CoInternetQueryInfo(); + test_FindMimeFromData(); + test_NameSpace(); + test_MimeFilter(); + test_ReleaseBindInfo(); + test_CopyStgMedium(); + test_CopyBindInfo(); + test_UrlMkGetSessionOption(); + test_user_agent(); + test_MkParseDisplayNameEx(); + test_IsValidURL(); + } + test_internet_features(); OleUninitialize();

1 0

Henri Verbeet : ddraw: Move the display mode related surface desc fixups from CreateSurface() to ddraw_surface_create_texture().
by Alexandre Julliard Nov. 15, 2013

Nov. 15, 2013

Module: wine Branch: master Commit: 9443c95a895a530fdbbb607758f674467e2010c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9443c95a895a530fdbbb60775… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 15 08:24:30 2013 +0100 ddraw: Move the display mode related surface desc fixups from CreateSurface() to ddraw_surface_create_texture(). --- dlls/ddraw/ddraw.c | 87 ----------------------------------------- dlls/ddraw/surface.c | 104 +++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 91 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9443c95a895a530fdbbb6…

1 0

Henri Verbeet : ddraw: Move the mipmap count fixup from CreateSurface() to ddraw_surface_create_texture().
by Alexandre Julliard Nov. 15, 2013

Nov. 15, 2013

Module: wine Branch: master Commit: 063a6c8d2d3e76e8a3b9c66519ad70a6608fc2b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=063a6c8d2d3e76e8a3b9c6651… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 15 08:24:29 2013 +0100 ddraw: Move the mipmap count fixup from CreateSurface() to ddraw_surface_create_texture(). --- dlls/ddraw/ddraw.c | 37 ------------------------------------- dlls/ddraw/surface.c | 50 ++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 40 insertions(+), 47 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 8891ed6..052023b 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3017,43 +3017,6 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, if (!desc2.dwWidth || !desc2.dwHeight) return DDERR_INVALIDPARAMS; - /* Mipmap count fixes */ - if(desc2.ddsCaps.dwCaps & DDSCAPS_MIPMAP) - { - if(desc2.ddsCaps.dwCaps & DDSCAPS_COMPLEX) - { - if(desc2.dwFlags & DDSD_MIPMAPCOUNT) - { - /* Mipmap count is given, should not be 0 */ - if( desc2.u2.dwMipMapCount == 0 ) - return DDERR_INVALIDPARAMS; - } - else - { - /* Undocumented feature: Create sublevels until - * either the width or the height is 1 - */ - DWORD min = desc2.dwWidth < desc2.dwHeight ? - desc2.dwWidth : desc2.dwHeight; - desc2.u2.dwMipMapCount = 0; - while( min ) - { - desc2.u2.dwMipMapCount += 1; - min >>= 1; - } - } - } - else - { - /* Not-complex mipmap -> Mipmapcount = 1 */ - desc2.u2.dwMipMapCount = 1; - } - - /* There's a mipmap count in the created surface in any case */ - desc2.dwFlags |= DDSD_MIPMAPCOUNT; - } - /* If no mipmap is given, the texture has only one level */ - /* The first surface is a front buffer, the back buffer is created afterwards */ if( (desc2.dwFlags & DDSD_CAPS) && (desc2.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) ) { diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index cad449c..c9903c0 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5633,6 +5633,44 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, /* Do not fail surface creation, only fail 3D device creation. */ } + /* Mipmap count fixes */ + if (desc->ddsCaps.dwCaps & DDSCAPS_MIPMAP) + { + if (desc->ddsCaps.dwCaps & DDSCAPS_COMPLEX) + { + if (desc->dwFlags & DDSD_MIPMAPCOUNT) + { + /* Mipmap count is given, should not be 0. */ + if (!desc->u2.dwMipMapCount) + return DDERR_INVALIDPARAMS; + } + else + { + /* Undocumented feature: Create sublevels until either the + * width or the height is 1. */ + DWORD min = desc->dwWidth < desc->dwHeight ? desc->dwWidth : desc->dwHeight; + + desc->u2.dwMipMapCount = 0; + while (min) + { + ++desc->u2.dwMipMapCount; + min >>= 1; + } + } + } + else + { + desc->u2.dwMipMapCount = 1; + } + + desc->dwFlags |= DDSD_MIPMAPCOUNT; + levels = desc->u2.dwMipMapCount; + } + else + { + levels = 1; + } + if (!(desc->ddsCaps.dwCaps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY)) && !((desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE) && (desc->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)))) @@ -5685,16 +5723,6 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, texture->version = version; copy_to_surfacedesc2(&texture->surface_desc, desc); - if (desc->ddsCaps.dwCaps & DDSCAPS_MIPMAP) - levels = desc->u2.dwMipMapCount; - else - levels = 1; - - if (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) - layers = 6; - else - layers = 1; - /* Some applications assume surfaces will always be mapped at the same * address. Some of those also assume that this address is valid even when * the surface isn't mapped, and that updates done this way will be @@ -5706,12 +5734,14 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, wined3d_desc.resource_type = WINED3D_RTYPE_CUBE_TEXTURE; hr = wined3d_texture_create_cube(ddraw->wined3d_device, &wined3d_desc, levels, WINED3D_SURFACE_PIN_SYSMEM, texture, &ddraw_texture_wined3d_parent_ops, &wined3d_texture); + layers = 6; } else { wined3d_desc.resource_type = WINED3D_RTYPE_TEXTURE; hr = wined3d_texture_create_2d(ddraw->wined3d_device, &wined3d_desc, levels, WINED3D_SURFACE_PIN_SYSMEM, texture, &ddraw_texture_wined3d_parent_ops, &wined3d_texture); + layers = 1; } if (FAILED(hr))

1 0