December 2006 - Wine-commits

Marcus Meissner : Made some functions static.
by Alexandre Julliard 12 Dec '06

12 Dec '06

Module: wine Branch: master Commit: 4d52a421d7e81dd71278762ac86a2f621e657924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d52a421d7e81dd71278762ac… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Dec 11 21:22:02 2006 +0100 Made some functions static. --- dlls/comctl32/tests/comboex.c | 4 ++-- dlls/comctl32/tests/header.c | 22 +++++++++++----------- dlls/comctl32/tests/monthcal.c | 2 +- dlls/comctl32/tests/progress.c | 8 ++++---- dlls/comctl32/tests/toolbar.c | 30 +++++++++++++++--------------- dlls/comctl32/tests/treeview.c | 4 ++-- dlls/usp10/tests/usp10.c | 16 ++++++++-------- dlls/winmm/tests/wave.c | 2 +- 8 files changed, 44 insertions(+), 44 deletions(-) diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index f9919ec..8943d82 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -172,10 +172,10 @@ static void test_comboboxex(void) { } -LRESULT CALLBACK ComboExTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +static LRESULT CALLBACK ComboExTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch(msg) { - + case WM_DESTROY: PostQuitMessage(0); break; diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index a9ec1a5..8e077f6 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -33,16 +33,16 @@ typedef struct tagEXPECTEDNOTIFY typedef LRESULT (*CUSTOMDRAWPROC)(int n, NMCUSTOMDRAW *nm); -CUSTOMDRAWPROC g_CustomDrawProc; -int g_CustomDrawCount; -DRAWITEMSTRUCT g_DrawItem; -BOOL g_DrawItemReceived; +static CUSTOMDRAWPROC g_CustomDrawProc; +static int g_CustomDrawCount; +static DRAWITEMSTRUCT g_DrawItem; +static BOOL g_DrawItemReceived; -EXPECTEDNOTIFY expectedNotify[10]; -INT nExpectedNotify = 0; -INT nReceivedNotify = 0; -INT unexpectedNotify[10]; -INT nUnexpectedNotify = 0; +static EXPECTEDNOTIFY expectedNotify[10]; +static INT nExpectedNotify = 0; +static INT nReceivedNotify = 0; +static INT unexpectedNotify[10]; +static INT nUnexpectedNotify = 0; static HWND hHeaderParentWnd; static HWND hWndHeader; @@ -611,7 +611,7 @@ static void run_customdraw_scenario(CUST g_CustomDrawProc = NULL; } -void test_customdraw() +static void test_customdraw(void) { int i; HDITEM item; @@ -735,7 +735,7 @@ static void test_header_order (void) DestroyWindow(hWndHeader); } -LRESULT CALLBACK HeaderTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +static LRESULT CALLBACK HeaderTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { DRAWITEMSTRUCT *di; switch(msg) { diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 4180d87..25b2065 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -28,7 +28,7 @@ #include "wine/test.h" -void test_monthcal(void) +static void test_monthcal(void) { HWND hwnd; SYSTEMTIME st[2], st1[2]; diff --git a/dlls/comctl32/tests/progress.c b/dlls/comctl32/tests/progress.c index bd0f8af..cfc0393 100644 --- a/dlls/comctl32/tests/progress.c +++ b/dlls/comctl32/tests/progress.c @@ -29,14 +29,14 @@ #include "wine/test.h" -HWND hProgressParentWnd, hProgressWnd; +static HWND hProgressParentWnd, hProgressWnd; static const char progressTestClass[] = "ProgressBarTestClass"; -LRESULT CALLBACK ProgressTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +static LRESULT CALLBACK ProgressTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch(msg) { - + case WM_DESTROY: PostQuitMessage(0); break; @@ -52,7 +52,7 @@ static WNDPROC progress_wndproc; static BOOL erased; static RECT last_paint_rect; -LRESULT CALLBACK ProgressSubclassProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +static LRESULT CALLBACK ProgressSubclassProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { if (msg == WM_PAINT) { diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 92e662b..f1f3187 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -32,11 +32,11 @@ #include "wine/test.h" -HWND hMainWnd; -BOOL g_fBlockHotItemChange; -BOOL g_fReceivedHotItemChange; -BOOL g_fExpectedHotItemOld; -BOOL g_fExpectedHotItemNew; +static HWND hMainWnd; +static BOOL g_fBlockHotItemChange; +static BOOL g_fReceivedHotItemChange; +static BOOL g_fExpectedHotItemOld; +static BOOL g_fExpectedHotItemNew; #define check_rect(name, val, exp) ok(val.top == exp.top && val.bottom == exp.bottom && \ val.left == exp.left && val.right == exp.right, "invalid rect (" name ") (%d,%d) (%d,%d) - expected (%d,%d) (%d,%d)\n", \ @@ -147,7 +147,7 @@ static void rebuild_toolbar(HWND *hToolb ok(SendMessage(*hToolbar, WM_SETFONT, (WPARAM)GetStockObject(SYSTEM_FONT), 0)==1, "WM_SETFONT\n"); } -void rebuild_toolbar_with_buttons(HWND *hToolbar) +static void rebuild_toolbar_with_buttons(HWND *hToolbar) { TBBUTTON buttons[5]; rebuild_toolbar(hToolbar); @@ -393,7 +393,7 @@ static void test_add_bitmap(void) "Too many string in table\n"); \ } -void test_add_string() +static void test_add_string(void) { LPCSTR test1 = "a\0b\0"; LPCSTR test2 = "|a|b||\0"; @@ -456,7 +456,7 @@ static void expect_hot_notify(int idold, ok(g_fReceivedHotItemChange, "TBN_HOTITEMCHANGE not received\n"); \ g_fExpectedHotItemOld = g_fExpectedHotItemNew = 0; -void test_hotitem() +static void test_hotitem(void) { HWND hToolbar = NULL; TBBUTTONINFO tbinfo; @@ -551,7 +551,7 @@ void test_hotitem() #if 0 /* use this to generate more tests*/ -void dump_sizes(HWND hToolbar) +static void dump_sizes(HWND hToolbar) { SIZE sz; RECT r; @@ -583,7 +583,7 @@ typedef struct RECT rcButtons[100]; } tbsize_result_t; -tbsize_result_t tbsize_results[] = +static tbsize_result_t tbsize_results[] = { { {0, 0, 672, 26}, {100, 22}, 5, { { 0, 2, 23, 24}, { 23, 2, 46, 24}, { 46, 2, 54, 24}, @@ -687,7 +687,7 @@ tbsize_result_t tbsize_results[] = }, }, }; -int tbsize_numtests = 0; +static int tbsize_numtests = 0; #define check_sizes_todo(todomask) { \ RECT rc; \ @@ -714,22 +714,22 @@ int tbsize_numtests = 0; #endif -TBBUTTON buttons1[] = { +static TBBUTTON buttons1[] = { {0, 10, TBSTATE_WRAP|TBSTATE_ENABLED, 0, {0, }, 0, -1}, {0, 11, 0, 0, {0, }, 0, -1}, }; -TBBUTTON buttons2[] = { +static TBBUTTON buttons2[] = { {0, 20, TBSTATE_ENABLED, 0, {0, }, 0, -1}, {0, 21, TBSTATE_ENABLED, 0, {0, }, 0, -1}, }; -TBBUTTON buttons3[] = { +static TBBUTTON buttons3[] = { {0, 30, TBSTATE_ENABLED, 0, {0, }, 0, 0}, {0, 31, TBSTATE_ENABLED, 0, {0, }, 0, 1}, {0, 32, TBSTATE_ENABLED, BTNS_AUTOSIZE, {0, }, 0, 1}, {0, 33, TBSTATE_ENABLED, BTNS_AUTOSIZE, {0, }, 0, (UINT_PTR)"Tst"} }; -void test_sizes() +static void test_sizes(void) { HWND hToolbar = NULL; int style; diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index b71be91..adf0ea4 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -132,10 +132,10 @@ static void DoTest2(void) ok(!strcmp(sequence, "1(nR)nR23(RC)RC45(CR)CR."), "root-child select test\n"); } -LRESULT CALLBACK MyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +static LRESULT CALLBACK MyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch(msg) { - + case WM_CREATE: { hTree = CreateWindowExA(WS_EX_CLIENTEDGE, WC_TREEVIEWA, NULL, WS_CHILD|WS_VISIBLE| diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index f9b1dec..45988d6 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -256,7 +256,7 @@ static void test_ScriptItemIzeShapePlace pItem[0].a.s.uBidiLevel); } -void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256]) +static void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256]) { HRESULT hr; SCRIPT_CACHE psc = NULL; @@ -312,7 +312,7 @@ void test_ScriptGetCMap(HDC hdc, unsigne } -void test_ScriptGetFontProperties(void) +static void test_ScriptGetFontProperties(void) { HRESULT hr; HDC hdc; @@ -388,7 +388,7 @@ void test_ScriptGetFontProperties(void) DestroyWindow(hwnd); } -void test_ScriptTextOut(void) +static void test_ScriptTextOut(void) { HRESULT hr; HWND hwnd; @@ -700,7 +700,7 @@ static void test_ScriptString(void) } } -void test_ScriptStringXtoCP_CPtoX(HDC hdc) +static void test_ScriptStringXtoCP_CPtoX(HDC hdc) { /***************************************************************************************** * @@ -872,10 +872,10 @@ void test_ScriptStringXtoCP_CPtoX(HDC hd * ScriptStringCPtoX should free ssa, hence ScriptStringFree should fail */ todo_wine ok(hr == E_INVALIDARG, "ScriptStringFree should return E_INVALIDARG not %08x\n", hr); - } + } } -void test_ScriptCacheGetHeight(HDC hdc) +static void test_ScriptCacheGetHeight(HDC hdc) { HRESULT hr; SCRIPT_CACHE sc = NULL; @@ -898,7 +898,7 @@ void test_ScriptCacheGetHeight(HDC hdc) ok(height > 0, "expected height > 0\n"); } -void test_ScriptGetGlyphABCWidth(HDC hdc) +static void test_ScriptGetGlyphABCWidth(HDC hdc) { HRESULT hr; LOGFONTA lf; @@ -927,7 +927,7 @@ void test_ScriptGetGlyphABCWidth(HDC hdc ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); } -void test_ScriptLayout(void) +static void test_ScriptLayout(void) { HRESULT hr; static const BYTE levels[][5] = diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 240f0f1..1ab9a19 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -287,7 +287,7 @@ const char * wave_open_flags(DWORD flags return msg; } -const char * wave_header_flags(DWORD flags) +static const char * wave_header_flags(DWORD flags) { #define WHDR_MASK (WHDR_BEGINLOOP|WHDR_DONE|WHDR_ENDLOOP|WHDR_INQUEUE|WHDR_PREPARED) static char msg[1024];

1 0

docs/en wineusr-configuring.sgml
by Dimi Paun 12 Dec '06

12 Dec '06

ChangeSet ID: 1165897602000951297189207168 CVSROOT: /cvsroot/wine Module name: docs Changes by: dimi(a)sc8-pr-cvs9.sourceforge.net 2006/12/11 20:26:42 Modified files: en : wineusr-configuring.sgml Log message: Dimi Paun <dimi(a)lattica.com> Simple rephrasing and some formatting fixes. Old revision New revision Changes Path 1.10 1.11 +5 -5 docs/en/wineusr-configuring.sgml Index: docs/en/wineusr-configuring.sgml diff -u -p docs/en/wineusr-configuring.sgml:1.10 docs/en/wineusr-configuring.sgml:1.11 --- docs/en/wineusr-configuring.sgml 12 Dec 2006 4:26:42 -0000 +++ /dev/null 12 Dec 2006 4:26:42 -0000 @@ -356,11 +356,11 @@ will be used. Older Linux distributions using the 2.4 kernel or earlier typically use the "OSS" driver. Usually 2.6 kernels have switched to "ALSA". - Bugs in "aRts" are not fixed from the KDE-side for a long time made - it recently nessesary to deactivate this driver. - If you're using GNOME you can probably use - EsounD. The OSS and ALSA audio drivers get the most testing, so - it's recommended you stick with them if possible. + The "aRts" driver was recently deactivated due to the general lack + of maintenance of the "aRts" subsystem. + If you're using GNOME you can probably use EsounD. The OSS and ALSA + audio drivers get the most testing, so it's recommended you stick + with them if possible. If you need to use "Jack", "NAS" or "CoreAudio" you probably already know why. </para> <para>

1 0

docs/en wineusr-configuring.sgml
by Dimi Paun 12 Dec '06

12 Dec '06

ChangeSet ID: 1165897243237250607068749 CVSROOT: /cvsroot/wine Module name: docs Changes by: dimi(a)sc8-pr-cvs9.sourceforge.net 2006/12/11 20:20:43 Modified files: en : wineusr-configuring.sgml Log message: Detlef Riekenberg <wine.dev(a)web.de> - Fix system32, winecfg and Printers. Old revision New revision Changes Path 1.9 1.10 +42 -29 docs/en/wineusr-configuring.sgml Index: docs/en/wineusr-configuring.sgml diff -u -p docs/en/wineusr-configuring.sgml:1.9 docs/en/wineusr-configuring.sgml:1.10 --- docs/en/wineusr-configuring.sgml 12 Dec 2006 4:20:43 -0000 +++ /dev/null 12 Dec 2006 4:20:43 -0000 @@ -50,7 +50,7 @@ </listitem> <listitem> <para> - Appearance + Desktop Integration </para> </listitem> <listitem> @@ -144,10 +144,10 @@ It's not always possible to run an application on builtin DLL's. Sometimes native DLL's simply work better. After you've located a native DLL on a Windows system, you'll - need to place it in suitable place for Wine to find it + need to put it in suitable place for Wine to find it and then configure it to be used. Generally the place you need to put it is in the directory you've configured - to be <filename>c:\windows\system</filename> (more on that in + to be <filename>c:\windows\system32</filename> (more on that in the drives section). There are four DLL's you should never try to use the native versions of: <filename>kernel32.dll</filename>, @@ -187,7 +187,7 @@ files to trick many programs that check for file existence to determine whether a particular feature (such as Winsock and its TCP/IP networking) is available. If this is a problem for you, you - can create empty files in the configured c:\windows\system directory + can create empty files in the configured c:\windows\system32 directory to make the program think it's there, and Wine's built-in DLL will be loaded when the program actually asks for it. (Unfortunately, tools/wineinstall does not create such empty files itself.) @@ -197,7 +197,7 @@ from the physical files (for example, to determine the DirectX version). Empty files will not do in this case, it is rather necessary to install files with complete version resources. This - problem is currently being worked on. In the meantime, you may still + problem is already fixed for many files. For others, you may still need to grab some real DLL files to fool these apps with. </para> <para> @@ -260,16 +260,7 @@ can configure. For most people the defaults are fine. </para> <para> - The first is the "screen color depth" and - represents the number of colors that can be displayed on the - screen. Older graphics cards had a hard time displaying a - full-range of colors and for them it's useful to be able to - specify an "8-bit" display. Modern video cards, namely anything - with over 8MB of memory, have no problem using a full 24 or 32-bit - depth. - </para> - <para> - The next few settings primarily affect games and are somewhat + The first few settings primarily affect games and are somewhat self-explanatory. You can prevent the mouse from leaving the window of a DirectX program (i.e. a game.) and the default is to have that box checked. There's lots of @@ -352,24 +343,25 @@ the format is a letter followed by a colon, such as "a:". So, if the link to your c: drive points to <filename> ~/.wine/drive_c</filename>, you - can interpret references to <filename>c:\windows\system</filename> - to mean <filename> ~/.wine/drive_c/windows/system</filename>. + can interpret references to <filename>c:\windows\system32</filename> + to mean <filename>~/.wine/drive_c/windows/system32</filename>. </para> </sect2> <sect2> <title>Audio Settings</title> <para> Wine can work with quite a few different audio subsystems - which you can choose under the "Audio" tab. The - "Autodetect" button can figure it all out for you, or you can - manually select a driver. Older + which you can choose under the "Audio" tab. winecfg figures out all + available drivers for you, but you can manually select which driver + will be used. Older Linux distributions using the 2.4 kernel or earlier typically - use the "OSS" driver. Newer 2.6 kernels have switched to "ALSA". - If you're using KDE, regardless of the kernel, you can probably - also use "aRts". If you're using GNOME you can probably use + use the "OSS" driver. Usually 2.6 kernels have switched to "ALSA". + Bugs in "aRts" are not fixed from the KDE-side for a long time made + it recently nessesary to deactivate this driver. + If you're using GNOME you can probably use EsounD. The OSS and ALSA audio drivers get the most testing, so it's recommended you stick with them if possible. - If you need to use "Jack" or "NAS" you probably already know why. + If you need to use "Jack", "NAS" or "CoreAudio" you probably already know why. </para> <para> DirectSound settings are primarily used by games. You can @@ -378,7 +370,7 @@ </para> </sect2> <sect2> - <title>Appearance</title> + <title>Desktop Integration</title> <para> Wine can load Windows themes if you have them available. While this certainly isn't necessary in order to use Wine or applications, @@ -409,7 +401,7 @@ </listitem> <listitem> <para> - Use the new Appearance tab of winecfg to select the new theme. + Use the Desktop Integration tab of winecfg to select the new theme. </para> </listitem> </orderedlist> @@ -705,10 +697,31 @@ <sect2> <title>Printers</title> <para> - Wine can interact directly with the CUPS printing system to + Wine can interact directly with the local CUPS printing system to find the printers available on your system. Configuring - printers with Wine is as simple as making sure your CUPS - configuration works. + printers with Wine is as simple as making sure your CUPS + configuration works. Wine still needs the command + <userinput>lpr</userinput>(from CUPS), when printing a Document. + </para> + <para> + If you do not use CUPS, the old BSD-Printing system is used: + <itemizedlist> + <listitem> + <para> + All Printers from <filename>/etc/printcap</filename> are installed automatically in Wine. + </para> + </listitem> + <listitem> + <para> + Wine needs a PPD-File for every Printer (generic.ppd comes with Wine) + </para> + </listitem> + <listitem> + <para> + The command <userinput>lpr</userinput> is called when printing a Document + </para> + </listitem> + </itemizedlist> </para> </sect2> <sect2>

1 0

docs/en wineusr-getting.sgml
by Dimi Paun 12 Dec '06

12 Dec '06

ChangeSet ID: 1165896768373632673247815 CVSROOT: /cvsroot/wine Module name: docs Changes by: dimi(a)sc8-pr-cvs9.sourceforge.net 2006/12/11 20:12:48 Modified files: en : wineusr-getting.sgml Log message: Detlef Riekenberg <wine.dev(a)web.de> - Fix a link and the source-archive suffix - configure creates config.h from configure.h.in - Do not run "make depend" / "make" as root Old revision New revision Changes Path 1.3 1.4 +5 -6 docs/en/wineusr-getting.sgml Index: docs/en/wineusr-getting.sgml diff -u -p docs/en/wineusr-getting.sgml:1.3 docs/en/wineusr-getting.sgml:1.4 --- docs/en/wineusr-getting.sgml 12 Dec 2006 4:12:48 -0000 +++ /dev/null 12 Dec 2006 4:12:48 -0000 @@ -49,7 +49,7 @@ </para> <para> Getting Wine source archives is simple. Every release, we put a - source package in compressed tar.gz format at the + source package in compressed tar.bz2 format at the <ulink url="http://www.winehq.org/site/download">WineHQ downloads page</ulink>. Compiling and installing Wine from source is slightly more difficult than using a package, however we will cover it in @@ -77,8 +77,7 @@ in testing if an application will still work right for the next release, or if a recent patch actually improves things. If you're interested in helping us to get an application working in Wine, see - the <ulink url="http://www.winehq.org/site/helping-applications"> - guide to helping applications work</ulink>. + the <ulink url="http://www.winehq.org/site/howto">HowTo</ulink>. </para> </sect2> </sect1> @@ -154,7 +153,7 @@ output before you compile Wine and see if anything important is missing; if it is, simply install what's missing and rerun configure before compiling. You can also check the file configure generates, - (include/config.h.in) and see if what files configure is looking for + (include/config.h) and see if what files configure is looking for but not finding. </para> </sect2> @@ -166,8 +165,8 @@ navigated to the Wine source tree, run the following commands: <screen> <prompt>$ </><userinput>./configure</> - <prompt># </><userinput>make depend</> - <prompt># </><userinput>make</> + <prompt>$ </><userinput>make depend</> + <prompt>$ </><userinput>make</> <prompt># </><userinput>make install</> </screen> The last command requires root privileges. Although you should

1 0

docs/en wineusr-introduction.sgml
by Dimi Paun 12 Dec '06

12 Dec '06

ChangeSet ID: 1165896666436210108063282 CVSROOT: /cvsroot/wine Module name: docs Changes by: dimi(a)sc8-pr-cvs9.sourceforge.net 2006/12/11 20:11:06 Modified files: en : wineusr-introduction.sgml Log message: Detlef Riekenberg <wine.dev(a)web.de> Fix wine release rate and Emulator-URLs. Old revision New revision Changes Path 1.3 1.4 +4 -4 docs/en/wineusr-introduction.sgml Index: docs/en/wineusr-introduction.sgml diff -u -p docs/en/wineusr-introduction.sgml:1.3 docs/en/wineusr-introduction.sgml:1.4 --- docs/en/wineusr-introduction.sgml 12 Dec 2006 4:11: 6 -0000 +++ /dev/null 12 Dec 2006 4:11: 6 -0000 @@ -206,8 +206,8 @@ <para> Wine is an open source project, and there are accordingly many different versions of Wine for you to choose from. The - standard version of Wine comes in intermittant releases - (roughly once a month), and can be downloaded over the + standard version of Wine comes in intermittent releases + (roughly twice a month), and can be downloaded over the internet in both prepackaged binary form and ready to compile source code form. Alternatively, you can install a development version of Wine by using the latest available source code from @@ -336,11 +336,11 @@ and some are also able to emulate x86 hardware on different platforms. The open source <ulink url="http://bochs.sourceforge.net/">Bochs</ulink> and <ulink - url="http://fabrice.bellard.free.fr/qemu/">QEMU</ulink> can run + url="http://www.qemu.org/">QEMU</ulink> can run both Windows and ReactOS virtually. Other, commercial virtual machine offerings include <ulink url="http://www.vmware.com/">VMware</ulink> and Microsoft's - <ulink url="http://www.microsoft.com/windowsxp/virtualpc/">VirtualPC</ulink>. + <ulink url="http://www.microsoft.com/windows/virtualpc/">VirtualPC</ulink>. </para> <para> There are significant drawbacks to using virtual machines,

1 0

Detlef Riekenberg : localspl/tests: Add tests for XcvOpenPort.
by Alexandre Julliard 11 Dec '06

11 Dec '06

Module: wine Branch: master Commit: 9f90c74fd8eaaf7441d0f7715911c864ee35a6a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f90c74fd8eaaf7441d0f7715… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Dec 8 14:02:17 2006 +0100 localspl/tests: Add tests for XcvOpenPort. --- dlls/localspl/tests/localmon.c | 51 +++++++++++++++++++++++++++++++++++++++- include/ddk/winsplp.h | 3 +- 2 files changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 55a1a9c..89dd757 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -54,7 +54,7 @@ static BOOL (WINAPI *pConfigurePort)(LP static BOOL (WINAPI *pDeletePort)(LPWSTR, HWND, LPWSTR); static BOOL (WINAPI *pGetPrinterDataFromPort)(HANDLE, DWORD, LPWSTR, LPWSTR, DWORD, LPWSTR, DWORD, LPDWORD); static BOOL (WINAPI *pSetPortTimeOuts)(HANDLE, LPCOMMTIMEOUTS, DWORD); -static BOOL (WINAPI *pXcvOpenPort)(HANDLE, LPCWSTR, ACCESS_MASK, PHANDLE phXcv); +static BOOL (WINAPI *pXcvOpenPort)(LPCWSTR, ACCESS_MASK, PHANDLE phXcv); static DWORD (WINAPI *pXcvDataPort)(HANDLE, LPCWSTR, PBYTE, DWORD, PBYTE, DWORD, PDWORD); static BOOL (WINAPI *pXcvClosePort)(HANDLE); @@ -291,6 +291,54 @@ static void test_InitializePrintMonitor( "returned %p with %d (expected %p)\n", res, GetLastError(), pm); } + +/* ########################### */ + +static void test_XcvOpenPort(void) +{ + DWORD res; + HANDLE hXcv; + + if ((pXcvOpenPort == NULL) || (pXcvClosePort == NULL)) return; + +#if 0 + /* crash with native localspl.dll (w2k+xp) */ + res = pXcvOpenPort(NULL, SERVER_ACCESS_ADMINISTER, &hXcv); + res = pXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, NULL); +#endif + + + /* The returned handle is the result from a previous "spoolss.dll,DllAllocSplMem" */ + SetLastError(0xdeadbeef); + hXcv = (HANDLE) 0xdeadbeef; + res = pXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); + ok(res, "returned %d with 0x%x and %p (expected '!= 0')\n", res, GetLastError(), hXcv); + if (res) pXcvClosePort(hXcv); + + + /* The ACCESS_MASK is not checked in XcvOpenPort */ + SetLastError(0xdeadbeef); + hXcv = (HANDLE) 0xdeadbeef; + res = pXcvOpenPort(emptyW, 0, &hXcv); + ok(res, "returned %d with 0x%x and %p (expected '!= 0')\n", res, GetLastError(), hXcv); + if (res) pXcvClosePort(hXcv); + + + /* A copy of pszObject is saved in the Memory-Block */ + SetLastError(0xdeadbeef); + hXcv = (HANDLE) 0xdeadbeef; + res = pXcvOpenPort(portname_lpt1W, SERVER_ALL_ACCESS, &hXcv); + ok(res, "returned %d with 0x%x and %p (expected '!= 0')\n", res, GetLastError(), hXcv); + if (res) pXcvClosePort(hXcv); + + SetLastError(0xdeadbeef); + hXcv = (HANDLE) 0xdeadbeef; + res = pXcvOpenPort(portname_fileW, SERVER_ALL_ACCESS, &hXcv); + ok(res, "returned %d with 0x%x and %p (expected '!= 0')\n", res, GetLastError(), hXcv); + if (res) pXcvClosePort(hXcv); + +} + /* ########################### */ #define GET_MONITOR_FUNC(name) \ @@ -352,4 +400,5 @@ START_TEST(localmon) test_ConfigurePort(); test_DeletePort(); test_EnumPorts(); + test_XcvOpenPort(); } diff --git a/include/ddk/winsplp.h b/include/ddk/winsplp.h index f4cc663..4dfdb5b 100644 --- a/include/ddk/winsplp.h +++ b/include/ddk/winsplp.h @@ -71,8 +71,7 @@ typedef struct _MONITOR { LPWSTR lpOutBuffer, DWORD cbOutBuffer, LPDWORD lpcbReturned); BOOL (WINAPI *pfnSetPortTimeOuts)(HANDLE hPort, LPCOMMTIMEOUTS lpCTO, DWORD reserved); - BOOL (WINAPI *pfnXcvOpenPort)(HANDLE hMonitor, LPCWSTR pszObject, - ACCESS_MASK GrantedAccess, PHANDLE phXcv); + BOOL (WINAPI *pfnXcvOpenPort)(LPCWSTR pszObject, ACCESS_MASK GrantedAccess, PHANDLE phXcv); DWORD (WINAPI *pfnXcvDataPort)(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, DWORD cbInputData, PBYTE pOutputData, DWORD cbOutputData, PDWORD pcbOutputNeeded);

1 0

Detlef Riekenberg : localspl/tests: Add tests for XcvClosePort.
by Alexandre Julliard 11 Dec '06

11 Dec '06

Module: wine Branch: master Commit: a2f0cb854231ad2f592786d10f2d62b9b325a135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2f0cb854231ad2f592786d10… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Dec 8 14:02:50 2006 +0100 localspl/tests: Add tests for XcvClosePort. --- dlls/localspl/tests/localmon.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 89dd757..00978e7 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -291,6 +291,38 @@ static void test_InitializePrintMonitor( "returned %p with %d (expected %p)\n", res, GetLastError(), pm); } +/* ########################### */ + +static void test_XcvClosePort(void) +{ + DWORD res; + HANDLE hXcv; + + if ((pXcvOpenPort == NULL) || (pXcvClosePort == NULL)) return; + +#if 0 + /* crash with native localspl.dll (w2k+xp) */ + res = pXcvClosePort(NULL); + res = pXcvClosePort(INVALID_HANDLE_VALUE); +#endif + + + SetLastError(0xdeadbeef); + hXcv = (HANDLE) 0xdeadbeef; + res = pXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); + ok(res, "returned %d with 0x%x and %p (expected '!= 0')\n", res, GetLastError(), hXcv); + + if (res) { + SetLastError(0xdeadbeef); + res = pXcvClosePort(hXcv); + ok( res, "returned %d with 0x%x(expected '!= 0')\n", res, GetLastError()); + +#if 0 + /* test for "Double Free": crash with native localspl.dll (w2k+xp) */ + res = pXcvClosePort(hXcv); +#endif + } +} /* ########################### */ @@ -400,5 +432,6 @@ START_TEST(localmon) test_ConfigurePort(); test_DeletePort(); test_EnumPorts(); + test_XcvClosePort(); test_XcvOpenPort(); }

1 0

Hans Leidekker : shell32: Add a stub implementation for SHLoadNonloadedIconOverlayIdentifiers.
by Alexandre Julliard 11 Dec '06

11 Dec '06

Module: wine Branch: master Commit: 3558cdb8d5aa948248a322b35654d9683f74c71b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3558cdb8d5aa948248a322b35… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Dec 11 13:57:51 2006 +0100 shell32: Add a stub implementation for SHLoadNonloadedIconOverlayIdentifiers. --- dlls/shell32/shell32.spec | 2 +- dlls/shell32/shell32_main.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 562db74..c61d996 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -361,7 +361,7 @@ @ stub SHInvokePrinterCommandW @ stdcall SHIsFileAvailableOffline(wstr ptr) @ stdcall SHLoadInProc(long) -@ stub SHLoadNonloadedIconOverlayIdentifiers +@ stdcall SHLoadNonloadedIconOverlayIdentifiers() @ stub SHPathPrepareForWriteA @ stub SHPathPrepareForWriteW @ stdcall SHQueryRecycleBinA(str ptr) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 1d572c6..797f98e 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1076,6 +1076,14 @@ void WINAPI FreeIconList( DWORD dw ) FIXME("%x: stub\n",dw); } +/************************************************************************* + * SHLoadNonloadedIconOverlayIdentifiers (SHELL32.@) + */ +HRESULT SHLoadNonloadedIconOverlayIdentifiers( VOID ) +{ + FIXME("stub\n"); + return S_OK; +} /*********************************************************************** * DllGetVersion [SHELL32.@]

1 0

Stefan Dösinger : wined3d: Move WINED3DRS_SEPARATEALPHABLENDENABLE to the state table.
by Alexandre Julliard 11 Dec '06

11 Dec '06

Module: wine Branch: master Commit: 92460b98d1d61ba85a9f2dd2d6e6b2ea18ab3564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92460b98d1d61ba85a9f2dd2d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 10 23:14:36 2006 +0100 wined3d: Move WINED3DRS_SEPARATEALPHABLENDENABLE to the state table. --- dlls/wined3d/device.c | 22 ++++------------------ dlls/wined3d/state.c | 14 ++++++++++---- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b2c129e..58d379f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3438,6 +3438,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_ADAPTIVETESS_W : case WINED3DRS_ENABLEADAPTIVETESSELLATION: case WINED3DRS_SRGBWRITEENABLE : + case WINED3DRS_SEPARATEALPHABLENDENABLE : + case WINED3DRS_SRCBLENDALPHA : + case WINED3DRS_DESTBLENDALPHA : + case WINED3DRS_BLENDOPALPHA : StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; @@ -3448,24 +3452,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3DERR_INVALIDCALL; } - case WINED3DRS_SEPARATEALPHABLENDENABLE : - { - if(Value) - ERR("(%p)->(%s,%d) not yet implemented. Missing of cap D3DPMISCCAPS_SEPARATEALPHABLEND wasn't honored?\n", This, debug_d3drenderstate(State), Value); - break; - } - - case WINED3DRS_SRCBLENDALPHA : - case WINED3DRS_DESTBLENDALPHA : - case WINED3DRS_BLENDOPALPHA : - { - if(This->stateBlock->renderState[WINED3DRS_SEPARATEALPHABLENDENABLE]) - FIXME("(%p)->(%s,%d) not yet implemented\n", This, debug_d3drenderstate(State), Value); - else - TRACE("(%p)->(%s,%d): recording state but WINED3DRS_SEPARATEALPHABLENDENABLE is not enabled\n", This, debug_d3drenderstate(State), Value); - break; - } - default: FIXME("(%p)->(%s,%d) unknown state\n", This, debug_d3drenderstate(State), Value); } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 44e1d47..b12940f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1214,6 +1214,12 @@ static void state_srgbwrite(DWORD state, ERR("Render state WINED3DRS_SRGBWRITEENABLE not yet implemented\n"); } +static void state_seperateblend(DWORD state, IWineD3DStateBlockImpl *stateblock) { + TRACE("Stub\n"); + if(stateblock->renderState[WINED3DRS_SEPARATEALPHABLENDENABLE]) + FIXME("(WINED3DRS_SEPARATEALPHABLENDENABLE,%d) not yet implemented\n", stateblock->renderState[WINED3DRS_SEPARATEALPHABLENDENABLE]); +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -1427,8 +1433,8 @@ const struct StateEntry StateTable[] = { /*203, WINED3DRS_WRAP13 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, { /*204, WINED3DRS_WRAP14 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, { /*205, WINED3DRS_WRAP15 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, - { /*206, WINED3DRS_SEPARATEALPHABLENDENABLE */ STATE_RENDER(WINED3DRS_SEPARATEALPHABLENDENABLE), state_unknown }, - { /*207, WINED3DRS_SRCBLENDALPHA */ STATE_RENDER(WINED3DRS_SEPARATEALPHABLENDENABLE), state_unknown }, - { /*208, WINED3DRS_DESTBLENDALPHA */ STATE_RENDER(WINED3DRS_SEPARATEALPHABLENDENABLE), state_unknown }, - { /*209, WINED3DRS_BLENDOPALPHA */ STATE_RENDER(WINED3DRS_SEPARATEALPHABLENDENABLE), state_unknown }, + { /*206, WINED3DRS_SEPARATEALPHABLENDENABLE */ STATE_RENDER(WINED3DRS_SEPARATEALPHABLENDENABLE), state_seperateblend }, + { /*207, WINED3DRS_SRCBLENDALPHA */ STATE_RENDER(WINED3DRS_SEPARATEALPHABLENDENABLE), state_seperateblend }, + { /*208, WINED3DRS_DESTBLENDALPHA */ STATE_RENDER(WINED3DRS_SEPARATEALPHABLENDENABLE), state_seperateblend }, + { /*209, WINED3DRS_BLENDOPALPHA */ STATE_RENDER(WINED3DRS_SEPARATEALPHABLENDENABLE), state_seperateblend }, };

1 0

Stefan Dösinger : wined3d: Move SRGBWRITEENABLE to the state table.
by Alexandre Julliard 11 Dec '06

11 Dec '06

Module: wine Branch: master Commit: 8a5bf91b4e0bd797d874dccc918250f84d8633a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a5bf91b4e0bd797d874dccc9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 10 23:13:38 2006 +0100 wined3d: Move SRGBWRITEENABLE to the state table. --- dlls/wined3d/device.c | 8 +------- dlls/wined3d/state.c | 8 +++++++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index baec6aa..b2c129e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3437,6 +3437,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_ADAPTIVETESS_Z : case WINED3DRS_ADAPTIVETESS_W : case WINED3DRS_ENABLEADAPTIVETESSELLATION: + case WINED3DRS_SRGBWRITEENABLE : StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; @@ -3447,13 +3448,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3DERR_INVALIDCALL; } - case WINED3DRS_SRGBWRITEENABLE : - { - if(Value) - ERR("(%p)->(%s,%d) not yet implemented\n", This, debug_d3drenderstate(State), Value); - break; - } - case WINED3DRS_SEPARATEALPHABLENDENABLE : { if(Value) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ff016ce..44e1d47 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1208,6 +1208,12 @@ static void state_tessellation(DWORD sta FIXME("(WINED3DRS_ENABLEADAPTIVETESSELLATION,%d) not yet implemented\n", stateblock->renderState[WINED3DRS_ENABLEADAPTIVETESSELLATION]); } + +static void state_srgbwrite(DWORD state, IWineD3DStateBlockImpl *stateblock) { + if(stateblock->renderState[WINED3DRS_SRGBWRITEENABLE]) + ERR("Render state WINED3DRS_SRGBWRITEENABLE not yet implemented\n"); +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -1409,7 +1415,7 @@ const struct StateEntry StateTable[] = { /*191, WINED3DRS_COLORWRITEENABLE2 */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, { /*192, WINED3DRS_COLORWRITEENABLE3 */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, { /*193, WINED3DRS_BLENDFACTOR */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), state_blend }, - { /*194, WINED3DRS_SRGBWRITEENABLE */ 0, state_nogl }, + { /*194, WINED3DRS_SRGBWRITEENABLE */ STATE_RENDER(WINED3DRS_SRGBWRITEENABLE), state_srgbwrite }, { /*195, WINED3DRS_DEPTHBIAS */ STATE_RENDER(WINED3DRS_DEPTHBIAS), state_depthbias }, { /*196, undefined */ 0, state_undefined }, { /*197, undefined */ 0, state_undefined },

1 0