September 2010 - Wine-Commits

Mariusz Pluciński : gameux: Add InstallGame implementation.
by Alexandre Julliard Sept. 16, 2010

Sept. 16, 2010

Module: wine Branch: master Commit: 5213d9d07e7e91062d37e07b6150f48c298dea1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5213d9d07e7e91062d37e07b6… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu Sep 16 13:55:19 2010 +0200 gameux: Add InstallGame implementation. --- dlls/gameux/gameexplorer.c | 130 +++++++++++++++++++++++++++++++++++--- dlls/gameux/tests/gameexplorer.c | 8 +- 2 files changed, 124 insertions(+), 14 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index 2619857..66173f2 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -73,7 +73,8 @@ void GAMEUX_uninitGameData(struct GAMEUX_GAME_DATA *GameData) * * Parameters: * installScope [I] the scope which was used in AddGame/InstallGame call - * gameInstanceId [I] game instance GUID + * gameInstanceId [I] game instance GUID. If NULL, then only + * path to scope will be returned * lpRegistryPath [O] pointer which will receive address to string * containing expected registry path. Path * is relative to HKLM registry key. It @@ -159,14 +160,17 @@ static HRESULT GAMEUX_buildGameRegistryPath(GAME_INSTALL_SCOPE installScope, else hr = E_INVALIDARG; - /* put game's instance id on the end of path */ - if(SUCCEEDED(hr)) - hr = (StringFromGUID2(gameInstanceId, sInstanceId, sizeof(sInstanceId)/sizeof(sInstanceId[0])) ? S_OK : E_FAIL); - - if(SUCCEEDED(hr)) + /* put game's instance id on the end of path, only if instance id was given */ + if(gameInstanceId) { - lstrcatW(sRegistryPath, sBackslash); - lstrcatW(sRegistryPath, sInstanceId); + if(SUCCEEDED(hr)) + hr = (StringFromGUID2(gameInstanceId, sInstanceId, sizeof(sInstanceId)/sizeof(sInstanceId[0])) ? S_OK : E_FAIL); + + if(SUCCEEDED(hr)) + { + lstrcatW(sRegistryPath, sBackslash); + lstrcatW(sRegistryPath, sInstanceId); + } } if(SUCCEEDED(hr)) @@ -691,6 +695,90 @@ static HRESULT GAMEUX_UpdateGame(LPGUID InstanceID) { return hr; } /******************************************************************************* + * GAMEUX_FindGameInstanceId + * + * Helper funtion. Searches for instance identifier of given game in given + * installation scope. + * + * Parameters: + * sGDFBinaryPath [I] path to binary containing GDF + * installScope [I] game install scope to search in + * pInstanceId [O] instance identifier of given game + * + * Returns: + * S_OK id was returned properly + * S_FALSE id was not found in the registry + * E_OUTOFMEMORY problem while memory allocation + */ +static HRESULT GAMEUX_FindGameInstanceId( + LPCWSTR sGDFBinaryPath, + GAME_INSTALL_SCOPE installScope, + GUID* pInstanceId) +{ + static const WCHAR sConfigGDFBinaryPath[] = + {'C','o','n','f','i','g','G','D','F','B','i','n','a','r','y','P','a','t','h',0}; + + HRESULT hr; + BOOL found = FALSE; + LPWSTR lpRegistryPath = NULL; + HKEY hRootKey; + DWORD dwSubKeys, dwSubKeyLen, dwMaxSubKeyLen, i; + LPWSTR lpName = NULL, lpValue = NULL; + + hr = GAMEUX_buildGameRegistryPath(installScope, NULL, &lpRegistryPath); + + if(SUCCEEDED(hr)) + /* enumerate all subkeys of received one and search them for value "ConfigGGDFBinaryPath" */ + hr = HRESULT_FROM_WIN32(RegOpenKeyExW(HKEY_LOCAL_MACHINE, + lpRegistryPath, 0, KEY_READ | KEY_WOW64_64KEY, &hRootKey)); + + if(SUCCEEDED(hr)) + { + hr = HRESULT_FROM_WIN32(RegQueryInfoKeyW(hRootKey, NULL, NULL, NULL, + &dwSubKeys, &dwMaxSubKeyLen, NULL, NULL, NULL, NULL, NULL, NULL)); + + if(SUCCEEDED(hr)) + { + ++dwMaxSubKeyLen; /* for string terminator */ + lpName = CoTaskMemAlloc(dwMaxSubKeyLen*sizeof(WCHAR)); + if(!lpName) hr = E_OUTOFMEMORY; + } + + if(SUCCEEDED(hr)) + { + for(i=0; i<dwSubKeys && !found; ++i) + { + dwSubKeyLen = dwMaxSubKeyLen; + hr = HRESULT_FROM_WIN32(RegEnumKeyExW(hRootKey, i, lpName, &dwSubKeyLen, + NULL, NULL, NULL, NULL)); + + if(SUCCEEDED(hr)) + hr = GAMEUX_LoadRegistryString(hRootKey, lpName, + sConfigGDFBinaryPath, &lpValue); + + if(SUCCEEDED(hr)) + if(lstrcmpW(lpValue, sGDFBinaryPath)==0) + { + /* key found, let's copy instance id and exit */ + hr = (GUIDFromStringW(lpName, pInstanceId) ? S_OK : E_FAIL); + found = TRUE; + } + HeapFree(GetProcessHeap(), 0, lpValue); + } + } + + HeapFree(GetProcessHeap(), 0, lpName); + RegCloseKey(hRootKey); + } + + HeapFree(GetProcessHeap(), 0, lpRegistryPath); + + if((SUCCEEDED(hr) && !found) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) + hr = S_FALSE; + + return hr; +} +/******************************************************************************* * GameExplorer implementation */ @@ -872,9 +960,31 @@ static HRESULT WINAPI GameExplorer2Impl_InstallGame( LPCWSTR installDirectory, GAME_INSTALL_SCOPE installScope) { + HRESULT hr; + GUID instanceId; GameExplorerImpl *This = impl_from_IGameExplorer2(iface); - FIXME("stub (%p, %s, %s, 0x%x)\n", This, debugstr_w(binaryGDFPath), debugstr_w(installDirectory), installScope); - return E_NOTIMPL; + + TRACE("(%p, %s, %s, 0x%x)\n", This, debugstr_w(binaryGDFPath), debugstr_w(installDirectory), installScope); + + if(!binaryGDFPath) + return E_INVALIDARG; + + hr = GAMEUX_FindGameInstanceId(binaryGDFPath, GIS_CURRENT_USER, &instanceId); + + if(hr == S_FALSE) + hr = GAMEUX_FindGameInstanceId(binaryGDFPath, GIS_ALL_USERS, &instanceId); + + if(hr == S_FALSE) + { + /* if game isn't yet registered, then install it */ + instanceId = GUID_NULL; + hr = GAMEUX_RegisterGame(binaryGDFPath, installDirectory, installScope, &instanceId); + } + else if(hr == S_OK) + /* otherwise, update game */ + hr = GAMEUX_UpdateGame(&instanceId); + + return hr; } static HRESULT WINAPI GameExplorer2Impl_UninstallGame( diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index 8553890..4fc432b 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -491,7 +491,7 @@ static void _findGameInstanceId(int line, } CoTaskMemFree(lpRegistryPath); - todo_wine ok_(__FILE__, line)(found==TRUE, "cannot find game with GDF path %s in scope %d\n", + ok_(__FILE__, line)(found==TRUE, "cannot find game with GDF path %s in scope %d\n", wine_dbgstr_w(sGDFBinaryPath), installScope); } /******************************************************************************* @@ -636,20 +636,20 @@ void test_install_uninstall_game(void) hr = IGameExplorer2_InstallGame(ge2, sExeName, sExePath, GIS_CURRENT_USER); - todo_wine ok(SUCCEEDED(hr), "IGameExplorer2::InstallGame failed (error 0x%08x)\n", hr); + ok(SUCCEEDED(hr), "IGameExplorer2::InstallGame failed (error 0x%08x)\n", hr); /* in comparision to AddGame, InstallGame does not return instance ID, * so we need to find it manually */ _findGameInstanceId(__LINE__, sExeName, GIS_CURRENT_USER, &guid); if(SUCCEEDED(hr)) { - todo_wine _validateGameRegistryKey(__LINE__, GIS_CURRENT_USER, &guid, &applicationId, sExePath, sExeName, TRUE); + _validateGameRegistryKey(__LINE__, GIS_CURRENT_USER, &guid, &applicationId, sExePath, sExeName, TRUE); hr = IGameExplorer2_UninstallGame(ge2, sExeName); todo_wine ok(SUCCEEDED(hr), "IGameExplorer2::UninstallGame failed (error 0x%08x)\n", hr); } - _validateGameRegistryKey(__LINE__, GIS_CURRENT_USER, &guid, &applicationId, sExePath, sExeName, FALSE); + todo_wine _validateGameRegistryKey(__LINE__, GIS_CURRENT_USER, &guid, &applicationId, sExePath, sExeName, FALSE); IGameExplorer2_Release(ge2); }

1 0

Mariusz Pluciński : gameux: Add UninstallGame implementation.
by Alexandre Julliard Sept. 16, 2010

Sept. 16, 2010

Module: wine Branch: master Commit: 95a9bc043e842a003234b8342fff11e91b555ed4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95a9bc043e842a003234b8342… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu Sep 16 13:55:34 2010 +0200 gameux: Add UninstallGame implementation. --- dlls/gameux/gameexplorer.c | 18 ++++++++++++++++-- dlls/gameux/tests/gameexplorer.c | 4 ++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index 66173f2..1816ebd 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -991,9 +991,23 @@ static HRESULT WINAPI GameExplorer2Impl_UninstallGame( IGameExplorer2 *iface, LPCWSTR binaryGDFPath) { + HRESULT hr; + GUID instanceId; GameExplorerImpl *This = impl_from_IGameExplorer2(iface); - FIXME("stub (%p, %s)\n", This, debugstr_w(binaryGDFPath)); - return E_NOTIMPL; + TRACE("(%p, %s)\n", This, debugstr_w(binaryGDFPath)); + + if(!binaryGDFPath) + return E_INVALIDARG; + + hr = GAMEUX_FindGameInstanceId(binaryGDFPath, GIS_CURRENT_USER, &instanceId); + + if(hr == S_FALSE) + hr = GAMEUX_FindGameInstanceId(binaryGDFPath, GIS_ALL_USERS, &instanceId); + + if(hr == S_OK) + hr = GAMEUX_RemoveRegistryRecord(&instanceId); + + return hr; } static const struct IGameExplorer2Vtbl GameExplorer2ImplVtbl = diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index 4fc432b..9ce0e39 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -646,10 +646,10 @@ void test_install_uninstall_game(void) _validateGameRegistryKey(__LINE__, GIS_CURRENT_USER, &guid, &applicationId, sExePath, sExeName, TRUE); hr = IGameExplorer2_UninstallGame(ge2, sExeName); - todo_wine ok(SUCCEEDED(hr), "IGameExplorer2::UninstallGame failed (error 0x%08x)\n", hr); + ok(SUCCEEDED(hr), "IGameExplorer2::UninstallGame failed (error 0x%08x)\n", hr); } - todo_wine _validateGameRegistryKey(__LINE__, GIS_CURRENT_USER, &guid, &applicationId, sExePath, sExeName, FALSE); + _validateGameRegistryKey(__LINE__, GIS_CURRENT_USER, &guid, &applicationId, sExePath, sExeName, FALSE); IGameExplorer2_Release(ge2); }

1 0

Jörg Höhle : winmm: Auto-open MCI core commands only.
by Alexandre Julliard Sept. 16, 2010

Sept. 16, 2010

Module: wine Branch: master Commit: b4cc03f3e3110934ac2810d65589e353c584be35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4cc03f3e3110934ac2810d65… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Sep 14 20:45:16 2010 +0200 winmm: Auto-open MCI core commands only. --- dlls/winmm/mci.c | 52 +++++++++++++++++++++++++++-------------------- dlls/winmm/tests/mci.c | 6 ++-- 2 files changed, 33 insertions(+), 25 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 485f436..400d343 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1242,9 +1242,6 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, static const WCHAR wszNew[] = {'n','e','w',0}; static const WCHAR wszSAliasS[] = {' ','a','l','i','a','s',' ',0}; static const WCHAR wszTypeS[] = {'t','y','p','e',' ',0}; - static const WCHAR wszSysinfo[] = {'s','y','s','i','n','f','o',0}; - static const WCHAR wszSound[] = {'s','o','u','n','d',0}; - static const WCHAR wszBreak[] = {'b','r','e','a','k',0}; TRACE("(%s, %p, %d, %p)\n", debugstr_w(lpstrCommand), lpstrRet, uRetLen, hwndCallback); @@ -1337,26 +1334,37 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, HeapFree(GetProcessHeap(), 0, devType); if (dwRet) goto errCleanUp; - } else if (!strcmpW(verb, wszSysinfo) || !strcmpW(verb, wszSound) || !strcmpW(verb, wszBreak)) { - /* Prevent auto-open for system commands. */ - } else if ((MCI_ALL_DEVICE_ID != uDevID) && !(wmd = MCI_GetDriver(mciGetDeviceIDW(dev)))) { - /* auto open */ - static const WCHAR wszOpenWait[] = {'o','p','e','n',' ','%','s',' ','w','a','i','t',0}; - WCHAR buf[138], retbuf[6]; - snprintfW(buf, sizeof(buf)/sizeof(WCHAR), wszOpenWait, dev); - /* open via mciSendString handles quoting, dev!file syntax and alias creation */ - if ((dwRet = mciSendStringW(buf, retbuf, sizeof(retbuf)/sizeof(WCHAR), 0)) != 0) - goto errCleanUp; - auto_open = strtoulW(retbuf, NULL, 10); - TRACE("auto-opened %u\n", auto_open); - - /* FIXME: test for notify flag (how to preparse?) before opening */ - /* FIXME: Accept only core commands yet parse them with the specific table */ - wmd = MCI_GetDriver(auto_open); - if (!wmd) { - ERR("No auto-open device %d for %s\n", auto_open, debugstr_w(dev)); - dwRet = MCIERR_INVALID_DEVICE_ID; + } else if ((MCI_ALL_DEVICE_ID != uDevID) && !(wmd = MCI_GetDriver(mciGetDeviceIDW(dev))) + && (lpCmd = MCI_FindCommand(MCI_GetCommandTable(0), verb))) { + /* auto-open uses the core command table */ + switch (MCI_GetMessage(lpCmd)) { + case MCI_SOUND: /* command does not use a device name */ + case MCI_SYSINFO: + break; + case MCI_CLOSE: /* don't auto-open for close */ + case MCI_BREAK: /* no auto-open for system commands */ + dwRet = MCIERR_INVALID_DEVICE_NAME; goto errCleanUp; + break; + default: + { + static const WCHAR wszOpenWait[] = {'o','p','e','n',' ','%','s',' ','w','a','i','t',0}; + WCHAR buf[138], retbuf[6]; + snprintfW(buf, sizeof(buf)/sizeof(WCHAR), wszOpenWait, dev); + /* open via mciSendString handles quoting, dev!file syntax and alias creation */ + if ((dwRet = mciSendStringW(buf, retbuf, sizeof(retbuf)/sizeof(WCHAR), 0)) != 0) + goto errCleanUp; + auto_open = strtoulW(retbuf, NULL, 10); + TRACE("auto-opened %u for %s\n", auto_open, debugstr_w(dev)); + + /* FIXME: test for notify flag (how to preparse?) before opening */ + wmd = MCI_GetDriver(auto_open); + if (!wmd) { + ERR("No auto-open device %u\n", auto_open); + dwRet = MCIERR_INVALID_DEVICE_ID; + goto errCleanUp; + } + } } } diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 1803c0c..ce91458 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -458,7 +458,7 @@ static void test_openCloseWAVE(HWND hwnd) Sleep(5); test_notification(hwnd, command_close_my, 0); - err = mciSendString("open no-such-file-exists.wav alias y", buf, sizeof(buf), NULL); + err = mciSendString("open no-such-file-exists.wav alias y buffer 6", buf, sizeof(buf), NULL); ok(err==MCIERR_FILE_NOT_FOUND,"open no-such-file.wav returned %s\n", dbg_mcierr(err)); if(!err) { err = mciSendString("close y", NULL, 0, NULL); @@ -485,7 +485,7 @@ static void test_openCloseWAVE(HWND hwnd) /* FIXME? use broken(INVALID_DEVICE_NAME) and have Wine not mimic Win9X? */ err = mciSendString("close waveaudio", buf, sizeof(buf), NULL); - todo_wine ok(err==MCIERR_INVALID_DEVICE_NAME,"open nosuchdevice!name: %s\n", dbg_mcierr(err)); + ok(err==MCIERR_INVALID_DEVICE_NAME,"close waveaudio: %s\n", dbg_mcierr(err)); err = mciSendString(command_close_all, NULL, 0, NULL); ok(!err,"mci %s (without buffer) returned %s\n", command_close_all, dbg_mcierr(err)); @@ -743,7 +743,7 @@ static void test_playWAVE(HWND hwnd) todo_wine ok(!strcmp(buf,"2000"), "mci status length gave %s, expected 2000, some tests will fail.\n", buf); err = mciSendString("cue output", NULL, 0, NULL); - todo_wine ok(err==MCIERR_UNRECOGNIZED_COMMAND,"mci incorrect cue output returned %s\n", dbg_mcierr(err)); + ok(err==MCIERR_UNRECOGNIZED_COMMAND,"mci incorrect cue output returned %s\n", dbg_mcierr(err)); /* Test MCI to the bones -- Some todo_wine from Cue and * from Play from 0 to 0 are not worth fixing. */

1 0

Luca Bennati : shdocvw: Update Italian translation.
by Alexandre Julliard Sept. 16, 2010

Sept. 16, 2010

Module: wine Branch: master Commit: ef50af4035a45e7ad0516a2ce096ed00cbd639c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef50af4035a45e7ad0516a2ce… Author: Luca Bennati <lucak3(a)gmail.com> Date: Thu Sep 16 09:13:45 2010 +0200 shdocvw: Update Italian translation. --- dlls/shdocvw/It.rc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/It.rc b/dlls/shdocvw/It.rc index 85d344d..de5a9fd 100644 --- a/dlls/shdocvw/It.rc +++ b/dlls/shdocvw/It.rc @@ -46,13 +46,14 @@ IDR_BROWSE_MAIN_MENU MENU } MENUITEM "&Apri...", ID_BROWSE_OPEN MENUITEM "&Salva", ID_BROWSE_SAVE - MENUITEM "Salva &come...", ID_BROWSE_SAVE_AS + MENUITEM "Sa&lva come...", ID_BROWSE_SAVE_AS MENUITEM SEPARATOR MENUITEM "&Imposta pagina...", ID_BROWSE_PRINT_FORMAT MENUITEM "S&tampa...", ID_BROWSE_PRINT MENUITEM "Antepri&ma di stampa...", ID_BROWSE_PRINT_PREVIEW MENUITEM SEPARATOR MENUITEM "&Proprietà...", ID_BROWSE_PROPERTIES + MENUITEM "&Chiudi", ID_BROWSE_QUIT } POPUP "&Visualizza" {

1 0

Jörg Höhle : winmm: Support MCI_SOUND.
by Alexandre Julliard Sept. 16, 2010

Sept. 16, 2010

Module: wine Branch: master Commit: 8fb1e3eba200d446e65aa46769a3cb0b8523157e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fb1e3eba200d446e65aa4676… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Mar 28 21:54:50 2010 +0200 winmm: Support MCI_SOUND. --- dlls/mmsystem.dll16/mci16.c | 1 + dlls/winmm/mci.c | 29 +++++++++++++++++++---------- dlls/winmm/tests/mci.c | 7 ++++--- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/mmsystem.dll16/mci16.c b/dlls/mmsystem.dll16/mci16.c index 914636d..d9bf7bb 100644 --- a/dlls/mmsystem.dll16/mci16.c +++ b/dlls/mmsystem.dll16/mci16.c @@ -87,6 +87,7 @@ static const char* MCI_MessageToString(UINT wMsg) CASE(MCI_SAVE); CASE(MCI_SEEK); CASE(MCI_SET); + CASE(MCI_SOUND); CASE(MCI_SPIN); CASE(MCI_STATUS); CASE(MCI_STEP); diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index c7e8165..485f436 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -178,6 +178,7 @@ static const char* MCI_MessageToString(UINT wMsg) CASE(MCI_SAVE); CASE(MCI_SEEK); CASE(MCI_SET); + CASE(MCI_SOUND); CASE(MCI_SPIN); CASE(MCI_STATUS); CASE(MCI_STEP); @@ -1438,6 +1439,12 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, } } break; + case MCI_SOUND: + /* FIXME: name is optional, "sound" is a valid command. + * FIXME: Parse "sound notify" as flag, not as name. */ + ((LPMCI_SOUND_PARMSW)data)->lpstrSoundName = dev; + dwFlags |= MCI_SOUND_NAME; + break; } TRACE("[%d, %s, %08x, %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx]\n", @@ -1942,16 +1949,18 @@ static DWORD MCI_Break(UINT wDevID, DWORD dwFlags, LPMCI_BREAK_PARMS lpParms) */ static DWORD MCI_Sound(UINT wDevID, DWORD dwFlags, LPMCI_SOUND_PARMSW lpParms) { - DWORD dwRet = 0; - - if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + DWORD dwRet; - if (dwFlags & MCI_SOUND_NAME) - dwRet = sndPlaySoundW(lpParms->lpstrSoundName, SND_SYNC) ? MMSYSERR_NOERROR : MMSYSERR_ERROR; - else - dwRet = MMSYSERR_ERROR; /* what should be done ??? */ + if (dwFlags & MCI_SOUND_NAME) { + if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + else dwRet = PlaySoundW(lpParms->lpstrSoundName, NULL, + SND_ALIAS | (dwFlags & MCI_WAIT ? SND_SYNC : SND_ASYNC)) + ? 0 : MCIERR_HARDWARE; + } else dwRet = PlaySoundW((LPCWSTR)SND_ALIAS_SYSTEMDEFAULT, NULL, + SND_ALIAS_ID | (dwFlags & MCI_WAIT ? SND_SYNC : SND_ASYNC)) + ? 0 : MCIERR_HARDWARE; - if (MMSYSERR_NOERROR==dwRet && (dwFlags & MCI_NOTIFY)) + if (!dwRet && lpParms && (dwFlags & MCI_NOTIFY)) mciDriverNotify((HWND)lpParms->dwCallback, wDevID, MCI_NOTIFY_SUCCESSFUL); return dwRet; } diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index f47d4f6..1803c0c 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -1057,12 +1057,13 @@ static void test_AutoOpenWAVE(HWND hwnd) ok(!err,"mci sysinfo waveaudio quantity open returned %s\n", dbg_mcierr(err)); if(!err) ok(!strcmp(buf,"0"), "sysinfo quantity open expected 0, got: %s, some more tests will fail.\n", buf); - /* Who knows why some machines pass all tests but return MCIERR_HARDWARE here? */ + /* Who knows why some MS machines pass all tests but return MCIERR_HARDWARE here? */ + /* Wine returns MCIERR_HARDWARE when no default sound is found in win.ini or the registry. */ err = mciSendString("sound NoSuchSoundDefined wait", NULL, 0, NULL); - todo_wine ok(err==ok_snd || broken(err==MCIERR_HARDWARE),"mci sound NoSuchSoundDefined returned %s\n", dbg_mcierr(err)); + ok(err==ok_snd || err==MCIERR_HARDWARE, "mci sound NoSuchSoundDefined returned %s\n", dbg_mcierr(err)); err = mciSendString("sound SystemExclamation notify wait", NULL, 0, hwnd); - todo_wine ok(err==ok_snd || broken(err==MCIERR_HARDWARE),"mci sound SystemExclamation returned %s\n", dbg_mcierr(err)); + ok(err==ok_snd || err==MCIERR_HARDWARE, "mci sound SystemExclamation returned %s\n", dbg_mcierr(err)); test_notification(hwnd, "sound notify", err ? 0 : MCI_NOTIFY_SUCCESSFUL); Sleep(16); /* time to auto-close makes sysinfo below return expected error */

1 0

Ričardas Barkauskas : d3d9/tests: Test NVDB ( depth bounds test) behavior.
by Alexandre Julliard Sept. 16, 2010

Sept. 16, 2010

Module: wine Branch: master Commit: b099eeb8c41adecb1373a856c32a50225a0c5d56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b099eeb8c41adecb1373a856c… Author: Ričardas Barkauskas <miegalius(a)gmail.com> Date: Tue Sep 14 01:04:53 2010 +0300 d3d9/tests: Test NVDB (depth bounds test) behavior. --- dlls/d3d9/tests/visual.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 120 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 48aad75..0c39456 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10549,6 +10549,125 @@ static void depth_clamp_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); } +static void depth_bounds_test(IDirect3DDevice9 *device) +{ + const struct tvertex quad1[] = + { + { 0, 0, 0.0f, 1, 0xfff9e814}, + { 640, 0, 0.0f, 1, 0xfff9e814}, + { 0, 480, 1.0f, 1, 0xfff9e814}, + { 640, 480, 1.0f, 1, 0xfff9e814}, + }; + const struct tvertex quad2[] = + { + { 0, 0, 0.6f, 1, 0xff002b7f}, + { 640, 0, 0.6f, 1, 0xff002b7f}, + { 0, 480, 0.6f, 1, 0xff002b7f}, + { 640, 480, 0.6f, 1, 0xff002b7f}, + }; + const struct tvertex quad3[] = + { + { 0, 100, 0.6f, 1, 0xfff91414}, + { 640, 100, 0.6f, 1, 0xfff91414}, + { 0, 160, 0.6f, 1, 0xfff91414}, + { 640, 160, 0.6f, 1, 0xfff91414}, + }; + + union { + DWORD d; + float f; + } tmpvalue; + + IDirect3D9 *d3d = NULL; + IDirect3DSurface9 *offscreen_surface = NULL; + D3DCOLOR color; + HRESULT hr; + + IDirect3DDevice9_GetDirect3D(device, &d3d); + if(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + 0, D3DRTYPE_SURFACE, MAKEFOURCC('N','V','D','B')) != D3D_OK) { + skip("No NVDB (depth bounds test) support\n"); + IDirect3D9_Release(d3d); + return; + } + IDirect3D9_Release(d3d); + + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 32, 32, + MAKEFOURCC('N','V','D','B'), D3DPOOL_DEFAULT, &offscreen_surface, NULL); + todo_wine ok(hr != D3D_OK, "Able to create surface, hr = %08x\n", hr); + if(offscreen_surface) + { + IDirect3DSurface9_Release(offscreen_surface); + } + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 1.0, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, TRUE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZWRITEENABLE, TRUE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZFUNC, D3DCMP_ALWAYS); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZRHW | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "SetFVF failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad1, sizeof(*quad1)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ADAPTIVETESS_X, MAKEFOURCC('N','V','D','B')); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + + tmpvalue.f = 0.625; + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ADAPTIVETESS_Z, tmpvalue.d); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + + tmpvalue.f = 0.75; + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ADAPTIVETESS_W, tmpvalue.d); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad2, sizeof(*quad2)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + + tmpvalue.f = 0.75; + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ADAPTIVETESS_Z, tmpvalue.d); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad3, sizeof(*quad3)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ADAPTIVETESS_X, 0); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + + color = getPixelColor(device, 150, 130); + ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); + color = getPixelColor(device, 150, 200); + ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); + color = getPixelColor(device, 150, 300-5); + ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); + color = getPixelColor(device, 150, 300+5); + ok(color_match(color, 0x00002b7f, 1), "color 0x%08x.\n", color);/**/ + color = getPixelColor(device, 150, 330); + ok(color_match(color, 0x00002b7f, 1), "color 0x%08x.\n", color); + color = getPixelColor(device, 150, 360-5); + ok(color_match(color, 0x00002b7f, 1), "color 0x%08x.\n", color);/**/ + color = getPixelColor(device, 150, 360+5); + ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); +} + static void depth_buffer_test(IDirect3DDevice9 *device) { static const struct vertex quad1[] = @@ -11246,6 +11365,7 @@ START_TEST(visual) depth_buffer_test(device_ptr); shadow_test(device_ptr); fp_special_test(device_ptr); + depth_bounds_test(device_ptr); cleanup: if(device_ptr) {

1 0

Alexandre Julliard : krnl386.exe: Remove 16 suffix on Get/ SetProcessDword since there's no 32-bit version.
by Alexandre Julliard Sept. 16, 2010

Sept. 16, 2010

Module: wine Branch: master Commit: 5b6a24cc7c17d0d11fb234047569549cbcaf3056 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b6a24cc7c17d0d11fb234047… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 16 10:03:26 2010 -0500 krnl386.exe: Remove 16 suffix on Get/SetProcessDword since there's no 32-bit version. --- dlls/krnl386.exe16/kernel.c | 4 ++-- dlls/krnl386.exe16/krnl386.exe16.spec | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/krnl386.exe16/kernel.c b/dlls/krnl386.exe16/kernel.c index 437eed1..a1f7fff 100644 --- a/dlls/krnl386.exe16/kernel.c +++ b/dlls/krnl386.exe16/kernel.c @@ -643,7 +643,7 @@ DWORD WINAPI MapProcessHandle( HANDLE hProcess ) * SetProcessDword (KERNEL.484) * 'Of course you cannot directly access Windows internal structures' */ -void WINAPI SetProcessDword16( DWORD dwProcessID, INT offset, DWORD value ) +void WINAPI SetProcessDword( DWORD dwProcessID, INT offset, DWORD value ) { TRACE("(%d, %d)\n", dwProcessID, offset ); @@ -684,7 +684,7 @@ void WINAPI SetProcessDword16( DWORD dwProcessID, INT offset, DWORD value ) * GetProcessDword (KERNEL.485) * 'Of course you cannot directly access Windows internal structures' */ -DWORD WINAPI GetProcessDword16( DWORD dwProcessID, INT offset ) +DWORD WINAPI GetProcessDword( DWORD dwProcessID, INT offset ) { DWORD x, y; STARTUPINFOW siw; diff --git a/dlls/krnl386.exe16/krnl386.exe16.spec b/dlls/krnl386.exe16/krnl386.exe16.spec index f3dbbea..f80cfcc 100644 --- a/dlls/krnl386.exe16/krnl386.exe16.spec +++ b/dlls/krnl386.exe16/krnl386.exe16.spec @@ -386,8 +386,8 @@ 481 pascal -ret16 _LeaveWin16Lock() _LeaveWin16Lock 482 pascal LoadSystemLibrary32(str) LoadLibrary32_16 # FIXME! 483 pascal MapProcessHandle(long) MapProcessHandle -484 pascal SetProcessDword(long s_word long) SetProcessDword16 -485 pascal GetProcessDword(long s_word) GetProcessDword16 +484 pascal SetProcessDword(long s_word long) SetProcessDword +485 pascal GetProcessDword(long s_word) GetProcessDword 486 pascal FreeLibrary32(long) FreeLibrary32_16 487 pascal GetModuleFileName32(long str word) GetModuleFileName32_16 488 pascal GetModuleHandle32(str) GetModuleHandle32_16 @@ -566,7 +566,7 @@ @ varargs -arch=win32 k32wsprintfA(str str) @ stdcall -arch=win32 k32wvsprintfA(ptr str ptr) @ stdcall -arch=win32 -register CommonUnimpStub() -@ stdcall -arch=win32 GetProcessDword16(long long) +@ stdcall -arch=win32 GetProcessDword(long long) @ stdcall -arch=win32 DosFileHandleToWin32Handle(long) @ stdcall -arch=win32 Win32HandleToDosFileHandle(long) @ stdcall -arch=win32 DisposeLZ32Handle(long)

1 0

Henri Verbeet : wined3d: Move sampler states to wined3d_state.
by Alexandre Julliard Sept. 16, 2010

Sept. 16, 2010

Module: wine Branch: master Commit: 8fdfc736bffa7e0c07772c37ac5d907c9c8d1d0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fdfc736bffa7e0c07772c37a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 16 11:19:58 2010 +0200 wined3d: Move sampler states to wined3d_state. --- dlls/wined3d/device.c | 50 +++++++++++++++++---------------------- dlls/wined3d/state.c | 10 ++++--- dlls/wined3d/stateblock.c | 42 ++++++++++++++++++--------------- dlls/wined3d/volumetexture.c | 2 +- dlls/wined3d/wined3d_private.h | 5 +-- 5 files changed, 54 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8fdfc736bffa7e0c07772…

1 0

Kovács András : dinput: Return an error in IDirectInputDevice2AImpl_GetProperty().
by Alexandre Julliard Sept. 16, 2010

Sept. 16, 2010

Module: wine Branch: master Commit: cde699b286789a5dc563333ddddec821187a14a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde699b286789a5dc563333dd… Author: Kovács András <andras(a)csevego.net> Date: Wed Sep 15 23:48:12 2010 -0500 dinput: Return an error in IDirectInputDevice2AImpl_GetProperty(). --- dlls/dinput/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index a5c61ab..430351e 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -887,8 +887,8 @@ HRESULT WINAPI IDirectInputDevice2AImpl_GetProperty( break; } default: - WARN("Unknown property %s\n", debugstr_guid(rguid)); - break; + FIXME("Unknown property %s\n", debugstr_guid(rguid)); + return DIERR_INVALIDPARAM; } return DI_OK;

1 0

Henri Verbeet : wined3d: Move the material to wined3d_state.
by Alexandre Julliard Sept. 16, 2010

Sept. 16, 2010

Module: wine Branch: master Commit: 5f6ced27670409e921123de123ad98c616885db8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f6ced27670409e921123de12… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 16 11:19:55 2010 +0200 wined3d: Move the material to wined3d_state. --- dlls/wined3d/device.c | 4 +- dlls/wined3d/state.c | 47 +++++++++++++++++++++------------------ dlls/wined3d/stateblock.c | 8 +++--- dlls/wined3d/wined3d_private.h | 4 +-- 4 files changed, 32 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 15df5ab..ab7e2ed 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2873,7 +2873,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetMaterial(IWineD3DDevice *iface, CONS IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; This->updateStateBlock->changed.material = TRUE; - This->updateStateBlock->material = *pMaterial; + This->updateStateBlock->state.material = *pMaterial; /* Handle recording of state blocks */ if (This->isRecordingState) { @@ -2887,7 +2887,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetMaterial(IWineD3DDevice *iface, CONS static HRESULT WINAPI IWineD3DDeviceImpl_GetMaterial(IWineD3DDevice *iface, WINED3DMATERIAL* pMaterial) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - *pMaterial = This->updateStateBlock->material; + *pMaterial = This->updateStateBlock->state.material; TRACE("(%p) : Diffuse (%f,%f,%f,%f)\n", This, pMaterial->Diffuse.r, pMaterial->Diffuse.g, pMaterial->Diffuse.b, pMaterial->Diffuse.a); TRACE("(%p) : Ambient (%f,%f,%f,%f)\n", This, pMaterial->Ambient.r, pMaterial->Ambient.g, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 50447b8..a37f8ee 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -716,10 +716,10 @@ static void state_specularenable(DWORD state, IWineD3DStateBlockImpl *stateblock TRACE("Setting specular enable state and materials\n"); if (stateblock->state.render_states[WINED3DRS_SPECULARENABLE]) { - glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, (float*) &stateblock->material.Specular); + glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, (float *)&stateblock->state.material.Specular); checkGLcall("glMaterialfv"); - if (stateblock->material.Power > gl_info->limits.shininess) + if (stateblock->state.material.Power > gl_info->limits.shininess) { /* glMaterialf man page says that the material says that GL_SHININESS must be between 0.0 * and 128.0, although in d3d neither -1 nor 129 produce an error. GL_NV_max_light_exponent @@ -727,10 +727,12 @@ static void state_specularenable(DWORD state, IWineD3DStateBlockImpl *stateblock * value reported by the extension, otherwise 128. For values > gl_info->limits.shininess clamp * them, it should be safe to do so without major visual distortions. */ - WARN("Material power = %f, limit %f\n", stateblock->material.Power, gl_info->limits.shininess); + WARN("Material power = %f, limit %f\n", stateblock->state.material.Power, gl_info->limits.shininess); glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, gl_info->limits.shininess); - } else { - glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, stateblock->material.Power); + } + else + { + glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, stateblock->state.material.Power); } checkGLcall("glMaterialf(GL_SHININESS)"); @@ -775,23 +777,23 @@ static void state_specularenable(DWORD state, IWineD3DStateBlockImpl *stateblock } TRACE("(%p) : Diffuse {%.8e, %.8e, %.8e, %.8e}\n", stateblock->device, - stateblock->material.Diffuse.r, stateblock->material.Diffuse.g, - stateblock->material.Diffuse.b, stateblock->material.Diffuse.a); + stateblock->state.material.Diffuse.r, stateblock->state.material.Diffuse.g, + stateblock->state.material.Diffuse.b, stateblock->state.material.Diffuse.a); TRACE("(%p) : Ambient {%.8e, %.8e, %.8e, %.8e}\n", stateblock->device, - stateblock->material.Ambient.r, stateblock->material.Ambient.g, - stateblock->material.Ambient.b, stateblock->material.Ambient.a); + stateblock->state.material.Ambient.r, stateblock->state.material.Ambient.g, + stateblock->state.material.Ambient.b, stateblock->state.material.Ambient.a); TRACE("(%p) : Specular {%.8e, %.8e, %.8e, %.8e}\n", stateblock->device, - stateblock->material.Specular.r, stateblock->material.Specular.g, - stateblock->material.Specular.b, stateblock->material.Specular.a); + stateblock->state.material.Specular.r, stateblock->state.material.Specular.g, + stateblock->state.material.Specular.b, stateblock->state.material.Specular.a); TRACE("(%p) : Emissive {%.8e, %.8e, %.8e, %.8e}\n", stateblock->device, - stateblock->material.Emissive.r, stateblock->material.Emissive.g, - stateblock->material.Emissive.b, stateblock->material.Emissive.a); + stateblock->state.material.Emissive.r, stateblock->state.material.Emissive.g, + stateblock->state.material.Emissive.b, stateblock->state.material.Emissive.a); - glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float*) &stateblock->material.Ambient); + glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float *)&stateblock->state.material.Ambient); checkGLcall("glMaterialfv(GL_AMBIENT)"); - glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, (float*) &stateblock->material.Diffuse); + glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, (float *)&stateblock->state.material.Diffuse); checkGLcall("glMaterialfv(GL_DIFFUSE)"); - glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, (float*) &stateblock->material.Emissive); + glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, (float *)&stateblock->state.material.Emissive); checkGLcall("glMaterialfv(GL_EMISSION)"); } @@ -1317,23 +1319,23 @@ static void state_colormat(DWORD state, IWineD3DStateBlockImpl *stateblock, stru * tracking with glColorMaterial, so apply those here. */ switch (context->tracking_parm) { case GL_AMBIENT_AND_DIFFUSE: - glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float*)&device->updateStateBlock->material.Ambient); - glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, (float*)&device->updateStateBlock->material.Diffuse); + glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float *)&device->updateStateBlock->state.material.Ambient); + glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, (float *)&device->updateStateBlock->state.material.Diffuse); checkGLcall("glMaterialfv"); break; case GL_DIFFUSE: - glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, (float*)&device->updateStateBlock->material.Diffuse); + glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, (float *)&device->updateStateBlock->state.material.Diffuse); checkGLcall("glMaterialfv"); break; case GL_AMBIENT: - glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float*)&device->updateStateBlock->material.Ambient); + glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float *)&device->updateStateBlock->state.material.Ambient); checkGLcall("glMaterialfv"); break; case GL_EMISSION: - glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, (float*)&device->updateStateBlock->material.Emissive); + glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, (float *)&device->updateStateBlock->state.material.Emissive); checkGLcall("glMaterialfv"); break; @@ -1341,7 +1343,8 @@ static void state_colormat(DWORD state, IWineD3DStateBlockImpl *stateblock, stru /* Only change material color if specular is enabled, otherwise it is set to black */ if (device->stateBlock->state.render_states[WINED3DRS_SPECULARENABLE]) { - glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, (float*)&device->updateStateBlock->material.Specular); + glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, + (float *)&device->updateStateBlock->state.material.Specular); checkGLcall("glMaterialfv"); } else { static const GLfloat black[] = {0.0f, 0.0f, 0.0f, 0.0f}; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 5a6d58e..13abfde 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -739,12 +739,12 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) This->vertexDecl = targetStateBlock->vertexDecl; } - if (This->changed.material - && memcmp(&targetStateBlock->material, &This->material, sizeof(This->material))) + if (This->changed.material && memcmp(&targetStateBlock->state.material, + &This->state.material, sizeof(This->state.material))) { TRACE("Updating material.\n"); - This->material = targetStateBlock->material; + This->state.material = targetStateBlock->state.material; } if (This->changed.viewport && memcmp(&targetStateBlock->state.viewport, @@ -990,7 +990,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Apply(IWineD3DStateBlock *iface) if (This->changed.material) { - IWineD3DDevice_SetMaterial(device, &This->material); + IWineD3DDevice_SetMaterial(device, &This->state.material); } if (This->changed.viewport) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 49e741a..b3c2617 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2349,6 +2349,7 @@ struct wined3d_stream_state struct wined3d_state { + WINED3DMATERIAL material; WINED3DVIEWPORT viewport; RECT scissor_rect; @@ -2405,9 +2406,6 @@ struct IWineD3DStateBlockImpl double clipplane[MAX_CLIPPLANES][4]; WINED3DCLIPSTATUS clip_status; - /* Material */ - WINED3DMATERIAL material; - /* Pixel Shader */ IWineD3DPixelShader *pixelShader;

1 0