August 2006 - Wine-commits - list.winehq.org

Stefan Leichter : quartz: Print 64bit integers with wine_dbgstr_longlong.
by Alexandre Julliard 18 Aug '06

18 Aug '06

Module: wine Branch: master Commit: 19d275f775e591b17fc530ba052298490eb0c862 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=19d275f775e591b17fc530b… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri Aug 18 18:52:37 2006 +0200 quartz: Print 64bit integers with wine_dbgstr_longlong. --- dlls/quartz/filtergraph.c | 5 +++-- dlls/quartz/systemclock.c | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index bbf22e6..1dcff3e 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1646,7 +1646,8 @@ static HRESULT WINAPI MediaSeeking_Conve const GUID *pSourceFormat) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaSeeking_vtbl, iface); - TRACE("(%p/%p)->(%p, %p, %lld, %p): stub !!!\n", This, iface, pTarget, pTargetFormat, Source, pSourceFormat); + TRACE("(%p/%p)->(%p, %p, 0x%s, %p): stub !!!\n", This, iface, pTarget, + pTargetFormat, wine_dbgstr_longlong(Source), pSourceFormat); return S_OK; } @@ -4067,7 +4068,7 @@ static HRESULT WINAPI MediaFilter_Pause( static HRESULT WINAPI MediaFilter_Run(IMediaFilter *iface, REFERENCE_TIME tStart) { - FIXME("(%lld): stub\n", tStart); + FIXME("(0x%s): stub\n", wine_dbgstr_longlong(tStart)); return E_NOTIMPL; } diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index f4391a4..6e2502e 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -260,7 +260,8 @@ static HRESULT WINAPI SystemClockImpl_Ad SystemClockImpl *This = (SystemClockImpl *)iface; SystemClockAdviseEntry* pEntry = NULL; - TRACE("(%p, %lld, %lld, %ld, %p)\n", This, rtBaseTime, rtStreamTime, hEvent, pdwAdviseCookie); + TRACE("(%p, 0x%s, 0x%s, %ld, %p)\n", This, wine_dbgstr_longlong(rtBaseTime), + wine_dbgstr_longlong(rtStreamTime), hEvent, pdwAdviseCookie); if ((HEVENT) 0 == hEvent) { return E_INVALIDARG; @@ -294,7 +295,8 @@ static HRESULT WINAPI SystemClockImpl_Ad SystemClockImpl *This = (SystemClockImpl *)iface; SystemClockAdviseEntry* pEntry = NULL; - TRACE("(%p, %lld, %lld, %ld, %p)\n", This, rtStartTime, rtPeriodTime, hSemaphore, pdwAdviseCookie); + TRACE("(%p, 0x%s, 0x%s, %ld, %p)\n", This, wine_dbgstr_longlong(rtStartTime), + wine_dbgstr_longlong(rtPeriodTime), hSemaphore, pdwAdviseCookie); if ((HSEMAPHORE) 0 == hSemaphore) { return E_INVALIDARG;

1 0

Alexandre Julliard : explorer: Specify an explicit path when launching winefile.
by Alexandre Julliard 18 Aug '06

18 Aug '06

Module: wine Branch: master Commit: 8e13333cb732c2f37b79be74c16d56a35813a3db URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8e13333cb732c2f37b79be7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 18 20:54:13 2006 +0200 explorer: Specify an explicit path when launching winefile. --- programs/explorer/explorer.c | 24 +++++++++--------------- 1 files changed, 9 insertions(+), 15 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 9a3bf7c..021259f 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -157,7 +157,7 @@ int WINAPI WinMain(HINSTANCE hinstance, PROCESS_INFORMATION info; parameters_struct parameters; BOOL rc; - static const WCHAR winefile[] = {'w','i','n','e','f','i','l','e','.','e','x','e',0}; + static const WCHAR winefile[] = {'\\','w','i','n','e','f','i','l','e','.','e','x','e',0}; static const WCHAR space[] = {' ',0}; LPWSTR winefile_commandline = NULL; DWORD len = 0; @@ -166,23 +166,22 @@ int WINAPI WinMain(HINSTANCE hinstance, memset(&si,0,sizeof(STARTUPINFOW)); ParseCommandLine(cmdline,&parameters); - len = lstrlenW(winefile) +1; + len = GetSystemDirectoryW( NULL, 0 ) + sizeof(winefile)/sizeof(WCHAR); + + if (parameters.selection[0]) len += lstrlenW(parameters.selection) + 2; + else if (parameters.root[0]) len += lstrlenW(parameters.root) + 3; + + winefile_commandline = HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR)); + GetSystemDirectoryW( winefile_commandline, len ); + lstrcatW(winefile_commandline,winefile); if (parameters.selection[0]) { - len += lstrlenW(parameters.selection) + 2; - winefile_commandline = HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR)); - - lstrcpyW(winefile_commandline,winefile); lstrcatW(winefile_commandline,space); lstrcatW(winefile_commandline,parameters.selection); } else if (parameters.root[0]) { - len += lstrlenW(parameters.root) + 3; - winefile_commandline = HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR)); - - lstrcpyW(winefile_commandline,winefile); lstrcatW(winefile_commandline,space); lstrcatW(winefile_commandline,parameters.root); if (winefile_commandline[lstrlenW(winefile_commandline)-1]!='\\') @@ -191,11 +190,6 @@ int WINAPI WinMain(HINSTANCE hinstance, lstrcatW(winefile_commandline,slash); } } - else - { - winefile_commandline = HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR)); - lstrcpyW(winefile_commandline,winefile); - } rc = CreateProcessW(NULL, winefile_commandline, NULL, NULL, FALSE, 0, NULL, parameters.root, &si, &info);

1 0

Frank Richter : shlwapi: Update German resources.
by Alexandre Julliard 18 Aug '06

18 Aug '06

Module: wine Branch: master Commit: 5c07d88ed13ff12b74a1554269036e4adf40fb39 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5c07d88ed13ff12b74a1554… Author: Frank Richter <frank.richter(a)gmail.com> Date: Fri Aug 18 18:00:29 2006 +0200 shlwapi: Update German resources. --- dlls/shlwapi/shlwapi_De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/shlwapi_De.rc b/dlls/shlwapi/shlwapi_De.rc index 1680b4a..a98005d 100644 --- a/dlls/shlwapi/shlwapi_De.rc +++ b/dlls/shlwapi/shlwapi_De.rc @@ -36,5 +36,5 @@ FONT 8, "MS Shell Dlg" STRINGTABLE DISCARDABLE { - IDS_BYTES_FORMAT "%ld bytes" + IDS_BYTES_FORMAT "%ld Bytes" }

1 0

Sagar Mittal : quartz: DSoundRender: Do not overwrite a full buffer.
by Alexandre Julliard 18 Aug '06

18 Aug '06

Module: wine Branch: master Commit: cb4889d940a40fc4a6fbac5a80c4468b0b7bcb29 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cb4889d940a40fc4a6fbac5… Author: Sagar Mittal <sagar.mittal(a)gmail.com> Date: Fri Aug 18 12:38:38 2006 -0400 quartz: DSoundRender: Do not overwrite a full buffer. --- dlls/quartz/dsoundrender.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index c095f7e..dfc285f 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -179,6 +179,13 @@ static HRESULT DSoundRender_SendSampleDa else buf_free = DSBUFFERSIZE - This->write_pos + play_pos; + /* This situation is ambiguous; Assume full when playing */ + if(buf_free == DSBUFFERSIZE && This->started) + { + Sleep(10); + continue; + } + size2 = min(buf_free, size); hr = IDirectSoundBuffer_Lock(This->dsbuffer, This->write_pos, size2, &lpbuf1, &dwsize1, &lpbuf2, &dwsize2, 0); if (hr != DS_OK) {

1 0

Jacek Caban : mshtml: Added more Exec tests and fixes.
by Alexandre Julliard 18 Aug '06

18 Aug '06

Module: wine Branch: master Commit: 3c71c7cc46e0f68c680625af5df655938618b955 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3c71c7cc46e0f68c680625a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 18 14:53:25 2006 +0200 mshtml: Added more Exec tests and fixes. --- dlls/mshtml/oleobj.c | 6 ++++-- dlls/mshtml/tests/htmldoc.c | 9 ++++++++- dlls/mshtml/view.c | 6 ++++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 127a8aa..aa1eee3 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -152,8 +152,10 @@ static HRESULT WINAPI OleObject_SetClien V_VT(&var) = VT_I4; V_I4(&var) = 0; - IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_SETPROGRESSMAX, 0, &var, NULL); - IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_SETPROGRESSPOS, 0, &var, NULL); + IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_SETPROGRESSMAX, + OLECMDEXECOPT_DONTPROMPTUSER, &var, NULL); + IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_SETPROGRESSPOS, + OLECMDEXECOPT_DONTPROMPTUSER, &var, NULL); IOleCommandTarget_Release(cmdtrg); } diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index c66c452..9f814bd 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -977,6 +977,8 @@ static HRESULT WINAPI OleCommandTarget_E DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { if(!pguidCmdGroup) { + ok(nCmdexecopt == OLECMDEXECOPT_DONTPROMPTUSER, "nCmdexecopts=%08lx\n", nCmdexecopt); + switch(nCmdID) { case OLECMDID_SETPROGRESSMAX: CHECK_EXPECT2(Exec_SETPROGRESSMAX); @@ -1008,7 +1010,8 @@ static HRESULT WINAPI OleCommandTarget_E return S_OK; case OLECMDID_UPDATECOMMANDS: CHECK_EXPECT(Exec_UPDATECOMMANDS); - /* TODO */ + ok(pvaIn == NULL, "pvaIn=%p\n", pvaIn); + ok(pvaOut == NULL, "pvaOut=%p\n", pvaOut); return S_OK; case OLECMDID_SETTITLE: CHECK_EXPECT2(Exec_SETTITLE); @@ -1025,6 +1028,8 @@ static HRESULT WINAPI OleCommandTarget_E } if(IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup)) { + ok(nCmdexecopt == 0, "nCmdexecopts=%08lx\n", nCmdexecopt); + switch(nCmdID) { case 37: CHECK_EXPECT2(Exec_ShellDocView_37); @@ -1042,6 +1047,8 @@ static HRESULT WINAPI OleCommandTarget_E } if(IsEqualGUID(&CGID_MSHTML, pguidCmdGroup)) { + ok(nCmdexecopt == 0, "nCmdexecopts=%08lx\n", nCmdexecopt); + switch(nCmdID) { case 2315: CHECK_EXPECT(Exec_MSHTML_2315); diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 3302f5f..dc7a74f 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -245,8 +245,10 @@ static HRESULT activate_window(HTMLDocum V_VT(&var) = VT_I4; V_I4(&var) = 0; - IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_SETPROGRESSMAX, 0, &var, NULL); - IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_SETPROGRESSPOS, 0, &var, NULL); + IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_SETPROGRESSMAX, + OLECMDEXECOPT_DONTPROMPTUSER, &var, NULL); + IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_SETPROGRESSPOS, + OLECMDEXECOPT_DONTPROMPTUSER, &var, NULL); IOleCommandTarget_Release(cmdtrg); }

1 0

Tom Wickline : DEVELOPERS-HINTS: Fix reference in implementing new API calls.
by Alexandre Julliard 18 Aug '06

18 Aug '06

Module: wine Branch: master Commit: a3c52ef87bf08058b6f3997d57d7a4230622d082 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a3c52ef87bf08058b6f3997… Author: Tom Wickline <twickline(a)gmail.com> Date: Fri Aug 18 11:14:04 2006 -0400 DEVELOPERS-HINTS: Fix reference in implementing new API calls. --- DEVELOPERS-HINTS | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/DEVELOPERS-HINTS b/DEVELOPERS-HINTS index d0436b0..56c88f8 100644 --- a/DEVELOPERS-HINTS +++ b/DEVELOPERS-HINTS @@ -277,13 +277,13 @@ uglier, because of the Pascal heritage a All of the Win32 APIs known to Wine are listed in the .spec file of their corresponding dll. An unimplemented call will look like (from gdi32.spec) - 269 stub PolyBezierTo + @ stub PolyPatBlt To implement this call, you need to do the following four things. 1. Find the appropriate parameters for the call, and add a prototype to the correct header file. In this case, that means [include/wingdi.h], and it might look like - BOOL WINAPI PolyBezierTo(HDC, LPCVOID, DWORD); + BOOL WINAPI PolyPatBlt(HDC, LPCVOID, DWORD); If the function has both an ASCII and a Unicode version, you need to define both and add a #define WINELIB_NAME_AW declaration. See below for discussion of function naming conventions. @@ -294,13 +294,13 @@ to use for the implementation. In Win32, is 32-bits. However, the relay code handles pointers and pointers to strings slightly differently, so you should use 'str' and 'wstr' for strings, 'ptr' for other pointer types, and 'long' for everything else. - 269 stdcall PolyBezierTo(long ptr long) PolyBezierTo -The 'PolyBezierTo' at the end of the line is which Wine function to use + @ stdcall PolyPatBlt(long ptr long) PolyPatBlt +The 'PolyPatBlt' at the end of the line is which Wine function to use for the implementation. 3. Implement the function as a stub. Once you add the function to the .spec file, you must add the function to the Wine source before it will link. -Add a function called 'PolyBezierTo' somewhere. Good things to put +Add a function called 'PolyPatBlt' somewhere. Good things to put into a stub: o a correct prototype, including the WINAPI o header comments, including full documentation for the function and @@ -309,7 +309,7 @@ into a stub: put in a stub. /************************************************************ - * PolyBezierTo (GDI32.269) + * PolyPatBlt (GDI32.@) * * Draw many Bezier curves. * @@ -325,7 +325,7 @@ into a stub: * BUGS * Unimplemented */ - BOOL WINAPI PolyBezierTo(HDC hdc, LPCVOID p, DWORD count) + BOOL WINAPI PolyPatBlt(HDC hdc, LPCVOID p, DWORD count) { /* tell the user they've got a substandard implementation */ FIXME("(%x,%p,%d): stub\n", hdc, p, count);

1 0

Frank Richter : winecfg: x11drv: Load vertex shader mode strings from resources.
by Alexandre Julliard 18 Aug '06

18 Aug '06

Module: wine Branch: master Commit: 61404d3d743b0edb6f2107815ea10c067879ad09 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=61404d3d743b0edb6f21078… Author: Frank Richter <frank.richter(a)gmail.com> Date: Fri Aug 18 17:59:39 2006 +0200 winecfg: x11drv: Load vertex shader mode strings from resources. --- programs/winecfg/Bg.rc | 7 +++++++ programs/winecfg/De.rc | 7 +++++++ programs/winecfg/En.rc | 7 +++++++ programs/winecfg/Es.rc | 7 +++++++ programs/winecfg/Fi.rc | 7 +++++++ programs/winecfg/Fr.rc | 7 +++++++ programs/winecfg/Hu.rc | 7 +++++++ programs/winecfg/Ja.rc | 7 +++++++ programs/winecfg/Ko.rc | 7 +++++++ programs/winecfg/Nl.rc | 7 +++++++ programs/winecfg/No.rc | 7 +++++++ programs/winecfg/Ru.rc | 7 +++++++ programs/winecfg/Tr.rc | 7 +++++++ programs/winecfg/resource.h | 3 +++ programs/winecfg/x11drvdlg.c | 28 +++++++++++++++++----------- 15 files changed, 111 insertions(+), 11 deletions(-) diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc index b363457..8264160 100644 --- a/programs/winecfg/Bg.rc +++ b/programs/winecfg/Bg.rc @@ -232,3 +232,10 @@ BEGIN IDS_USE_GLOBAL_SETTINGS "Use global settings" IDS_SELECT_EXECUTABLE "Select an executable file" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SHADER_MODE_HARDWARE "Hardware" + IDS_SHADER_MODE_NONE "None" + IDS_SHADER_MODE_EMULATION "Emulated" +END diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index 0c8fcaa..bc6489d 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -230,3 +230,10 @@ BEGIN IDS_USE_GLOBAL_SETTINGS "Globale Einstellung benutzen" IDS_SELECT_EXECUTABLE "Ausf�hrbares Programm ausw�hlen" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SHADER_MODE_HARDWARE "Hardware" + IDS_SHADER_MODE_NONE "Aus" + IDS_SHADER_MODE_EMULATION "Emuliert" +END diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index 157d727..fc6799e 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -232,6 +232,13 @@ BEGIN IDS_SELECT_EXECUTABLE "Select an executable file" END +STRINGTABLE DISCARDABLE +BEGIN + IDS_SHADER_MODE_HARDWARE "Hardware" + IDS_SHADER_MODE_NONE "None" + IDS_SHADER_MODE_EMULATION "Emulated" +END + /****************************************************************/ /* English neutral resources /****************************************************************/ diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc index ba3fd92..841d0e3 100644 --- a/programs/winecfg/Es.rc +++ b/programs/winecfg/Es.rc @@ -226,3 +226,10 @@ BEGIN IDS_USE_GLOBAL_SETTINGS "Use global settings" IDS_SELECT_EXECUTABLE "Select an executable file" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SHADER_MODE_HARDWARE "Hardware" + IDS_SHADER_MODE_NONE "None" + IDS_SHADER_MODE_EMULATION "Emulated" +END diff --git a/programs/winecfg/Fi.rc b/programs/winecfg/Fi.rc index 3eedd2f..a98d243 100644 --- a/programs/winecfg/Fi.rc +++ b/programs/winecfg/Fi.rc @@ -229,3 +229,10 @@ BEGIN IDS_USE_GLOBAL_SETTINGS "Use global settings" IDS_SELECT_EXECUTABLE "Select an executable file" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SHADER_MODE_HARDWARE "Hardware" + IDS_SHADER_MODE_NONE "None" + IDS_SHADER_MODE_EMULATION "Emulated" +END diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc index 5320311..0bd019d 100644 --- a/programs/winecfg/Fr.rc +++ b/programs/winecfg/Fr.rc @@ -230,3 +230,10 @@ BEGIN IDS_USE_GLOBAL_SETTINGS "Use global settings" IDS_SELECT_EXECUTABLE "Select an executable file" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SHADER_MODE_HARDWARE "Hardware" + IDS_SHADER_MODE_NONE "None" + IDS_SHADER_MODE_EMULATION "Emulated" +END diff --git a/programs/winecfg/Hu.rc b/programs/winecfg/Hu.rc index 7b0db4e..fd8d652 100644 --- a/programs/winecfg/Hu.rc +++ b/programs/winecfg/Hu.rc @@ -226,3 +226,10 @@ BEGIN IDS_USE_GLOBAL_SETTINGS "Use global settings" IDS_SELECT_EXECUTABLE "Select an executable file" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SHADER_MODE_HARDWARE "Hardware" + IDS_SHADER_MODE_NONE "None" + IDS_SHADER_MODE_EMULATION "Emulated" +END diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc index bab5250..e9b26c6 100644 --- a/programs/winecfg/Ja.rc +++ b/programs/winecfg/Ja.rc @@ -224,3 +224,10 @@ BEGIN IDS_USE_GLOBAL_SETTINGS "Use global settings" IDS_SELECT_EXECUTABLE "Select an executable file" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SHADER_MODE_HARDWARE "Hardware" + IDS_SHADER_MODE_NONE "None" + IDS_SHADER_MODE_EMULATION "Emulated" +END diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index 9e6e1ef..98ba59a 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -233,3 +233,10 @@ BEGIN IDS_USE_GLOBAL_SETTINGS "��ü �� " IDS_SELECT_EXECUTABLE "�� " END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SHADER_MODE_HARDWARE "Hardware" + IDS_SHADER_MODE_NONE "None" + IDS_SHADER_MODE_EMULATION "Emulated" +END diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc index 8cd1fc1..e6c9568 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -231,3 +231,10 @@ BEGIN IDS_USE_GLOBAL_SETTINGS "Use global settings" IDS_SELECT_EXECUTABLE "Select an executable file" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SHADER_MODE_HARDWARE "Hardware" + IDS_SHADER_MODE_NONE "None" + IDS_SHADER_MODE_EMULATION "Emulated" +END diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index 00c2788..39370a4 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -229,3 +229,10 @@ END IDS_USE_GLOBAL_SETTINGS "Bruk globale innstillinger" IDS_SELECT_EXECUTABLE "Velg en programfil" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SHADER_MODE_HARDWARE "Hardware" + IDS_SHADER_MODE_NONE "None" + IDS_SHADER_MODE_EMULATION "Emulated" +END diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc index dae05b7..5ea8138 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc @@ -226,3 +226,10 @@ BEGIN IDS_USE_GLOBAL_SETTINGS "Use global settings" IDS_SELECT_EXECUTABLE "Select an executable file" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SHADER_MODE_HARDWARE "Hardware" + IDS_SHADER_MODE_NONE "None" + IDS_SHADER_MODE_EMULATION "Emulated" +END diff --git a/programs/winecfg/Tr.rc b/programs/winecfg/Tr.rc index ad5a8ab..9ea2b19 100644 --- a/programs/winecfg/Tr.rc +++ b/programs/winecfg/Tr.rc @@ -229,3 +229,10 @@ BEGIN IDS_USE_GLOBAL_SETTINGS "Genel ayarlar� kullan" IDS_SELECT_EXECUTABLE "�al��t�r�labilir bir dosya se�in" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SHADER_MODE_HARDWARE "Hardware" + IDS_SHADER_MODE_NONE "None" + IDS_SHADER_MODE_EMULATION "Emulated" +END diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h index 67013c1..5d66962 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -139,6 +139,9 @@ #define IDC_USE_TAKE_FOCUS #define IDC_DOUBLE_BUFFER 1104 #define IDC_D3D_VSHADER_MODE 1105 #define IDC_D3D_PSHADER_MODE 1106 +#define IDS_SHADER_MODE_HARDWARE 8100 +#define IDS_SHADER_MODE_NONE 8101 +#define IDS_SHADER_MODE_EMULATION 8102 /* applications tab */ #define IDC_APP_LISTVIEW 1200 diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index f90b120..c02938f 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -38,11 +38,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(winecfg); #define RES_MAXLEN 5 /* the maximum number of characters in a screen dimension. 5 digits should be plenty, what kind of crazy person runs their screen >10,000 pixels across? */ -static const char* D3D_VS_Modes[] = { - "hardware", - "none", - "emulation", - NULL +static struct SHADERMODE +{ + UINT displayStrID; + const char* settingStr; +} const D3D_VS_Modes[] = { + {IDS_SHADER_MODE_HARDWARE, "hardware"}, + {IDS_SHADER_MODE_EMULATION, "emulation"}, + {IDS_SHADER_MODE_NONE, "none"}, + {0, 0} }; @@ -145,17 +149,18 @@ static void init_dialog(HWND dialog) HeapFree(GetProcessHeap(), 0, buf); SendDlgItemMessage(dialog, IDC_D3D_VSHADER_MODE, CB_RESETCONTENT, 0, 0); - for (it = 0; NULL != D3D_VS_Modes[it]; ++it) { - SendDlgItemMessage(dialog, IDC_D3D_VSHADER_MODE, CB_ADDSTRING, 0, (LPARAM) D3D_VS_Modes[it]); + for (it = 0; 0 != D3D_VS_Modes[it].displayStrID; ++it) { + SendDlgItemMessageW (dialog, IDC_D3D_VSHADER_MODE, CB_ADDSTRING, 0, + (LPARAM)load_string (D3D_VS_Modes[it].displayStrID)); } buf = get_reg_key(config_key, keypath("Direct3D"), "VertexShaderMode", "hardware"); - for (it = 0; NULL != D3D_VS_Modes[it]; ++it) { - if (strcmp(buf, D3D_VS_Modes[it]) == 0) { + for (it = 0; NULL != D3D_VS_Modes[it].settingStr; ++it) { + if (strcmp(buf, D3D_VS_Modes[it].settingStr) == 0) { SendDlgItemMessage(dialog, IDC_D3D_VSHADER_MODE, CB_SETCURSEL, it, 0); break ; } } - if (NULL == D3D_VS_Modes[it]) { + if (NULL == D3D_VS_Modes[it].settingStr) { WINE_ERR("Invalid Direct3D VertexShader Mode read from registry (%s)\n", buf); } HeapFree(GetProcessHeap(), 0, buf); @@ -238,7 +243,8 @@ static void on_double_buffer_clicked(HWN static void on_d3d_vshader_mode_changed(HWND dialog) { int selected_mode = SendDlgItemMessage(dialog, IDC_D3D_VSHADER_MODE, CB_GETCURSEL, 0, 0); - set_reg_key(config_key, keypath("Direct3D"), "VertexShaderMode", D3D_VS_Modes[selected_mode]); + set_reg_key(config_key, keypath("Direct3D"), "VertexShaderMode", + D3D_VS_Modes[selected_mode].settingStr); } static void on_d3d_pshader_mode_clicked(HWND dialog) {

1 0

Paul Vriens : ntdll: Fix failing test on windows.
by Alexandre Julliard 18 Aug '06

18 Aug '06

Module: wine Branch: master Commit: 54f18be44dec763d9c283aabc8bbf9d12b06346f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=54f18be44dec763d9c283aa… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Fri Aug 18 10:57:40 2006 +0200 ntdll: Fix failing test on windows. --- dlls/ntdll/path.c | 2 +- dlls/ntdll/tests/path.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 78ee9fd..84c15a4 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -339,7 +339,7 @@ ULONG WINAPI RtlIsDosDeviceName_U( PCWST } end = dos_name + strlenW(dos_name) - 1; - if (end >= dos_name && *end == ':') end--; /* remove trailing ':' */ + while (end >= dos_name && *end == ':') end--; /* remove all trailing ':' */ /* find start of file name */ for (start = end; start >= dos_name; start--) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 14af1cf..14546f3 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -101,7 +101,8 @@ static void test_RtlIsDosDeviceName(void { "", 0, 0 }, { "\\\\foo\\nul", 0, 0 }, { "c:\\nul:", 6, 6 }, - { "c:\\nul::", 0, 0 }, + { "c:\\nul::", 6, 6 }, + { "c:\\nul::::::", 6, 6 }, { "c:prn ", 4, 6 }, { "c:prn.......", 4, 6 }, { "c:prn... ...", 4, 6 },

1 0

Detlef Riekenberg : sfc: Print a FIXME only once.
by Alexandre Julliard 18 Aug '06

18 Aug '06

Module: wine Branch: master Commit: 33bd852cd2715cdc9fc696aaaa62a22d5f3682ba URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=33bd852cd2715cdc9fc696a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Aug 17 21:28:32 2006 +0200 sfc: Print a FIXME only once. --- dlls/sfc/sfc_main.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/sfc/sfc_main.c b/dlls/sfc/sfc_main.c index 69b46d6..6563365 100644 --- a/dlls/sfc/sfc_main.c +++ b/dlls/sfc/sfc_main.c @@ -52,7 +52,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(sfc); */ BOOL WINAPI SfcIsFileProtected(HANDLE RpcHandle, LPCWSTR ProtFileName) { - FIXME("(%p, %s) stub\n", RpcHandle, debugstr_w(ProtFileName)); + static BOOL reported = FALSE; + + if (reported) { + TRACE("(%p, %s) stub\n", RpcHandle, debugstr_w(ProtFileName)); + } + else + { + FIXME("(%p, %s) stub\n", RpcHandle, debugstr_w(ProtFileName)); + reported = TRUE; + } + SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; }

1 0

Robert Reif : dsound: Add class factory tests.
by Alexandre Julliard 18 Aug '06

18 Aug '06

Module: wine Branch: master Commit: 425608a1205ed93bd00fc3ed920e57f6657deaff URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=425608a1205ed93bd00fc3e… Author: Robert Reif <reif(a)earthlink.net> Date: Fri Aug 18 01:14:12 2006 -0400 dsound: Add class factory tests. --- dlls/dsound/tests/capture.c | 11 +++++++++++ dlls/dsound/tests/dsound.c | 11 +++++++++++ dlls/dsound/tests/dsound8.c | 11 +++++++++++ dlls/dsound/tests/duplex.c | 4 ++-- dlls/dsound/tests/propset.c | 9 +++++++++ 5 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index 5185e4e..8ed8aa2 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -192,9 +192,20 @@ static void IDirectSoundCapture_tests(vo { HRESULT rc; LPDIRECTSOUNDCAPTURE dsco=NULL; + LPCLASSFACTORY cf=NULL; trace("Testing IDirectSoundCapture\n"); + rc=CoGetClassObject(&CLSID_DirectSoundCapture, CLSCTX_INPROC_SERVER, NULL, + &IID_IClassFactory, (void**)&cf); + ok(rc==S_OK,"CoGetClassObject(CLSID_DirectSoundCapture, IID_IClassFactory) " + "failed: %s\n", DXGetErrorString8(rc)); + + rc=CoGetClassObject(&CLSID_DirectSoundCapture, CLSCTX_INPROC_SERVER, NULL, + &IID_IUnknown, (void**)&cf); + ok(rc==S_OK,"CoGetClassObject(CLSID_DirectSoundCapture, IID_IUnknown) " + "failed: %s\n", DXGetErrorString8(rc)); + /* try the COM class factory method of creation with no device specified */ rc=CoCreateInstance(&CLSID_DirectSoundCapture, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSoundCapture, (void**)&dsco); diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 5d4845c..6163484 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -172,9 +172,20 @@ static void IDirectSound_tests(void) { HRESULT rc; LPDIRECTSOUND dso=NULL; + LPCLASSFACTORY cf=NULL; trace("Testing IDirectSound\n"); + rc=CoGetClassObject(&CLSID_DirectSound, CLSCTX_INPROC_SERVER, NULL, + &IID_IClassFactory, (void**)&cf); + ok(rc==S_OK,"CoGetClassObject(CLSID_DirectSound, IID_IClassFactory) " + "failed: %s\n", DXGetErrorString8(rc)); + + rc=CoGetClassObject(&CLSID_DirectSound, CLSCTX_INPROC_SERVER, NULL, + &IID_IUnknown, (void**)&cf); + ok(rc==S_OK,"CoGetClassObject(CLSID_DirectSound, IID_IUnknown) " + "failed: %s\n", DXGetErrorString8(rc)); + /* try the COM class factory method of creation with no device specified */ rc=CoCreateInstance(&CLSID_DirectSound, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSound, (void**)&dso); diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index e207a9e..af90ac6 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -191,9 +191,20 @@ static void IDirectSound8_tests(void) { HRESULT rc; LPDIRECTSOUND8 dso=NULL; + LPCLASSFACTORY cf=NULL; trace("Testing IDirectSound8\n"); + rc=CoGetClassObject(&CLSID_DirectSound8, CLSCTX_INPROC_SERVER, NULL, + &IID_IClassFactory, (void**)&cf); + ok(rc==S_OK,"CoGetClassObject(CLSID_DirectSound8, IID_IClassFactory) " + "failed: %s\n", DXGetErrorString8(rc)); + + rc=CoGetClassObject(&CLSID_DirectSound8, CLSCTX_INPROC_SERVER, NULL, + &IID_IUnknown, (void**)&cf); + ok(rc==S_OK,"CoGetClassObject(CLSID_DirectSound8, IID_IUnknown) " + "failed: %s\n", DXGetErrorString8(rc)); + /* try the COM class factory method of creation with no device specified */ rc=CoCreateInstance(&CLSID_DirectSound8, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSound8, (void**)&dso); diff --git a/dlls/dsound/tests/duplex.c b/dlls/dsound/tests/duplex.c index 2b23833..e4095c1 100644 --- a/dlls/dsound/tests/duplex.c +++ b/dlls/dsound/tests/duplex.c @@ -66,7 +66,7 @@ static void IDirectSoundFullDuplex_test( ok(ref==0, "IDirectSound_Release() has %d references, " "should have 0\n", ref); } - + rc=IDirectSoundFullDuplex_QueryInterface(dsfdo,&IID_IDirectSound8,(LPVOID*)&ds8); ok(rc==(initialized?DS_OK:E_NOINTERFACE),"IDirectSoundFullDuplex_QueryInterface(IID_IDirectSound8) " "failed: %s\n",DXGetErrorString8(rc)); @@ -136,7 +136,7 @@ static void IDirectSoundFullDuplex_tests if (dsfdo) IDirectSoundFullDuplex_test(dsfdo, FALSE, NULL, NULL); - /* try the COM class factory method of creation with default devices + /* try the COM class factory method of creation with default devices * specified */ rc=CoCreateInstance(&CLSID_DirectSoundFullDuplex, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSoundFullDuplex, diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c index 766b338..2c11afa 100644 --- a/dlls/dsound/tests/propset.c +++ b/dlls/dsound/tests/propset.c @@ -202,6 +202,15 @@ static void propset_private_tests(void) "IID_IClassFactory) should have returned DSERR_INVALIDPARAM, " "returned: %s\n",DXGetErrorString8(rc)); + rc = (fProc)(&CLSID_DirectSound, &IID_IDirectSound, (void **)(&pcf)); + ok(rc==E_NOINTERFACE,"DllGetClassObject(CLSID_DirectSound, " + "IID_IDirectSound) should have returned E_NOINTERFACE, " + "returned: %s\n",DXGetErrorString8(rc)); + + rc = (fProc)(&CLSID_DirectSound, &IID_IUnknown, (void **)(&pcf)); + ok(rc==DS_OK,"DllGetClassObject(CLSID_DirectSound, " + "IID_IUnknown) failed: %s\n",DXGetErrorString8(rc)); + rc = (fProc)(&CLSID_DirectSound, &IID_IClassFactory, (void **)(&pcf)); ok(pcf!=0, "DllGetClassObject(CLSID_DirectSound, IID_IClassFactory) " "failed: %s\n",DXGetErrorString8(rc));

1 0