November 2010 - Wine-Commits

Paul Vriens : include: Fix a define.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: 84880bf819bee441c406a9bbccdacb7745d82479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84880bf819bee441c406a9bbc… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Nov 12 19:35:56 2010 +0100 include: Fix a define. --- include/atliface.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/atliface.idl b/include/atliface.idl index 887338f..cbdae28 100644 --- a/include/atliface.idl +++ b/include/atliface.idl @@ -76,4 +76,4 @@ cpp_quote("BOOL WINAPI AtlAxWinInit(void);") cpp_quote("HWND WINAPI AtlAxCreateDialogW(HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM);") cpp_quote("HWND WINAPI AtlAxCreateDialogA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM);") -cpp_quote("#define AtlAxCreateDialog WINELIB_NAME_AW(AtlAxCreateDialog") +cpp_quote("#define AtlAxCreateDialog WINELIB_NAME_AW(AtlAxCreateDialog)")

1 0

Jeff Latimer : atl: Fix a comment.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: 7d3d21a894a7bdc4f60668ac081e35802139b64f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d3d21a894a7bdc4f60668ac0… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Sat Nov 13 13:56:30 2010 +1100 atl: Fix a comment. --- dlls/atl/registrar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index c9d7e6c..eb33b3b 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -832,7 +832,7 @@ HRESULT WINAPI DllRegisterServer(void) } /*********************************************************************** - * DllRegisterServer (ATL.@) + * DllUnRegisterServer (ATL.@) */ HRESULT WINAPI DllUnregisterServer(void) {

1 0

Alexandre Julliard : winapi: Add support for more spec entry flags.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: 0e034b634af87698a82c6d3932887462e8976eb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e034b634af87698a82c6d393… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 15 12:59:34 2010 +0100 winapi: Add support for more spec entry flags. --- tools/winapi/winapi.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winapi/winapi.pm b/tools/winapi/winapi.pm index 928476d..965c766 100644 --- a/tools/winapi/winapi.pm +++ b/tools/winapi/winapi.pm @@ -391,7 +391,7 @@ sub parse_spec_file($$) { } } } - } elsif(/^(\d+|@)\s+stub(?:\s+(-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-noname|-norelay|-i386|-ret16|-ret64|-private))*\s+(\S+)$/) { + } elsif(/^(\d+|@)\s+stub(?:\s+(-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-noname|-norelay|-ordinal|-i386|-ret16|-ret64|-private))*\s+(\S+)$/) { $ordinal = $1; my $flags = $2; @@ -440,7 +440,7 @@ sub parse_spec_file($$) { } else { # if($$function_external_module{$external_name} !~ /$module/) { $$function_external_module{$external_name} .= " & $module"; } - } elsif(/^(\d+|@)\s+extern(?:\s+(?:-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-norelay|-i386|-ret16|-ret64))*\s+(\S+)\s*(\S*)$/) { + } elsif(/^(\d+|@)\s+extern(?:\s+(?:-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-noname|-norelay|-ordinal|-i386|-ret16|-ret64))*\s+(\S+)\s*(\S*)$/) { $ordinal = $1; my $external_name = $2;

1 0

Louis Lenders : wine.inf: Add another .NET v3.0 registry-key.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: 9119f3562d62c53d6640a5b5b1acdb847a54479b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9119f3562d62c53d6640a5b5b… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Nov 12 21:48:23 2010 +0100 wine.inf: Add another .NET v3.0 registry-key. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 0bdfa36..aad4612 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -508,6 +508,7 @@ HKLM,Software\Microsoft\NET Framework Setup\NDP\v2.0.50727,Version,2,2.2.30729 HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0,Install,0x10003,1 HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0,SP,0x10003,2 HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0,Version,2,3.2.30729 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0\Setup,InstallSuccess,0x10003,1 HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,Install,0x10003,1 HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,SP,0x10003,1 HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,Version,2,3.5.30729.01

1 0

Andrew Eikum : shell32: PIDLs should be checked recursively in SHChangeNotify.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: b75b9fab2f2b10c68a7473512a461492b0dce190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b75b9fab2f2b10c68a7473512… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Nov 12 15:32:55 2010 -0600 shell32: PIDLs should be checked recursively in SHChangeNotify. --- dlls/shell32/changenotify.c | 2 +- dlls/shell32/tests/shlfolder.c | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index 95f2e42..43c81c3 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -243,7 +243,7 @@ static BOOL should_notify( LPCITEMIDLIST changed, LPCITEMIDLIST watched, BOOL su return FALSE; if (ILIsEqual( watched, changed ) ) return TRUE; - if( sub && ILIsParent( watched, changed, TRUE ) ) + if( sub && ILIsParent( watched, changed, FALSE ) ) return TRUE; return FALSE; } diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 43b721d..31ef752 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4218,6 +4218,7 @@ struct ChNotifyTest { const char path_2[256]; } chnotify_tests[] = { {"MKDIR", 1, 0, SHCNE_MKDIR, "C:\\shell32_cn_test\\test", ""}, + {"CREATE", 1, 0, SHCNE_CREATE, "C:\\shell32_cn_test\\test\\file.txt", ""}, {"RMDIR", 1, 0, SHCNE_RMDIR, "C:\\shell32_cn_test\\test", ""}, };

1 0

Andrew Eikum : shell32/tests: Make SHChangeNotify tests more easily extendible.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: 71fad7d18d9657e132cb125af8a95ba2cdf9a2ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=71fad7d18d9657e132cb125af… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Nov 12 15:32:49 2010 -0600 shell32/tests: Make SHChangeNotify tests more easily extendible. --- dlls/shell32/tests/shlfolder.c | 141 ++++++++++++++++++++-------------------- 1 files changed, 71 insertions(+), 70 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 6294c5d..43b721d 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -71,6 +71,26 @@ static HRESULT (WINAPI *pSHGetIDListFromObject)(IUnknown*, PIDLIST_ABSOLUTE*); static HRESULT (WINAPI *pSHGetItemFromObject)(IUnknown*,REFIID,void**); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); +static WCHAR *make_wstr(const char *str) +{ + WCHAR *ret; + int len; + + if(!str || strlen(str) == 0) + return NULL; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + if(!len || len < 0) + return NULL; + + ret = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if(!ret) + return NULL; + + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + return ret; +} + static int strcmp_wa(LPCWSTR strw, const char *stra) { CHAR buf[512]; @@ -4189,13 +4209,19 @@ static void test_ParseDisplayNamePBC(void) static const CHAR testwindow_class[] = "testwindow"; #define WM_USER_NOTIFY (WM_APP+1) -static struct { - const char *id; - BOOL exp_notify; +struct ChNotifyTest { + const char id[256]; + const UINT notify_count; + UINT missing_events; UINT signal; - const WCHAR *path_1; - const WCHAR *path_2; -} exp_data; + const char path_1[256]; + const char path_2[256]; +} chnotify_tests[] = { + {"MKDIR", 1, 0, SHCNE_MKDIR, "C:\\shell32_cn_test\\test", ""}, + {"RMDIR", 1, 0, SHCNE_RMDIR, "C:\\shell32_cn_test\\test", ""}, +}; + +struct ChNotifyTest *exp_data; static LRESULT CALLBACK testwindow_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { @@ -4203,20 +4229,25 @@ static LRESULT CALLBACK testwindow_wndproc(HWND hwnd, UINT msg, WPARAM wparam, L switch(msg){ case WM_USER_NOTIFY: - if(exp_data.exp_notify){ + if(exp_data->missing_events > 0){ + WCHAR *path1, *path2; LPCITEMIDLIST *pidls = (LPCITEMIDLIST*)wparam; - ok(exp_data.signal == signal, + ok(exp_data->signal == signal, "%s: expected notification type %x, got: %x\n", - exp_data.id, exp_data.signal, signal); + exp_data->id, exp_data->signal, signal); - trace("verifying pidls for: %s\n", exp_data.id); - verify_pidl(pidls[0], exp_data.path_1); - verify_pidl(pidls[1], exp_data.path_2); + trace("verifying pidls for: %s\n", exp_data->id); + path1 = make_wstr(exp_data->path_1); + path2 = make_wstr(exp_data->path_2); + verify_pidl(pidls[0], path1); + verify_pidl(pidls[1], path2); + HeapFree(GetProcessHeap(), 0, path1); + HeapFree(GetProcessHeap(), 0, path2); - exp_data.exp_notify = FALSE; + exp_data->missing_events--; }else - ok(exp_data.exp_notify, "Didn't expect a WM_USER_NOTIFY message (event: %x)\n", signal); + ok(0, "Didn't expect a WM_USER_NOTIFY message (event: %x)\n", signal); return 0; } return DefWindowProc(hwnd, msg, wparam, lparam); @@ -4244,37 +4275,31 @@ static void register_testwindow_class(void) static void do_events(void) { int c = 0; - while (exp_data.exp_notify && (c++ < 10)){ + while (exp_data->missing_events && (c++ < 10)){ MSG msg; while(PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)){ TranslateMessage(&msg); DispatchMessageA(&msg); } - if(exp_data.exp_notify) + if(exp_data->missing_events) Sleep(500); } - trace("%s: took %d tries\n", exp_data.id, c); + trace("%s: took %d tries\n", exp_data->id, c); } static void test_SHChangeNotify(void) { HWND wnd; - ULONG notifyID; + ULONG notifyID, i; HRESULT hr; BOOL br, has_unicode; SHChangeNotifyEntry entries[1]; const CHAR root_dirA[] = "C:\\shell32_cn_test"; const WCHAR root_dirW[] = {'C',':','\\','s','h','e','l','l','3','2','_','c','n','_','t','e','s','t',0}; - const CHAR test_dirA[] = "C:\\shell32_cn_test\\test"; - const WCHAR test_dirW[] = {'C',':','\\','s','h','e','l','l','3','2','_','c','n','_','t','e','s','t','\\','t','e','s','t',0}; CreateDirectoryW(NULL, NULL); has_unicode = !(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED); - /* set up the root directory & window */ - br = CreateDirectoryA(root_dirA, NULL); - ok(br == TRUE, "CreateDirectory failed: %d\n", GetLastError()); - register_testwindow_class(); wnd = CreateWindowExA(0, testwindow_class, testwindow_class, 0, @@ -4282,6 +4307,9 @@ static void test_SHChangeNotify(void) NULL, NULL, GetModuleHandleA(NULL), 0); ok(wnd != NULL, "Failed to make a window\n"); + br = CreateDirectoryA(root_dirA, NULL); + ok(br == TRUE, "CreateDirectory failed: %d\n", GetLastError()); + entries[0].pidl = NULL; if(has_unicode) hr = SHILCreateFromPath(root_dirW, (LPITEMIDLIST*)&entries[0].pidl, 0); @@ -4294,55 +4322,28 @@ static void test_SHChangeNotify(void) SHCNE_ALLEVENTS, WM_USER_NOTIFY, 1, entries); ok(notifyID != 0, "Failed to register a window for change notifications\n"); - /* MKDIR */ - br = CreateDirectoryA(test_dirA, NULL); - ok(br == TRUE, "CreateDirectory failed: %d\n", GetLastError()); + for(i = 0; i < sizeof(chnotify_tests) / sizeof(*chnotify_tests); ++i){ + exp_data = chnotify_tests + i; - if(has_unicode){ - exp_data.id = "MKDIR PATHW"; - exp_data.signal = SHCNE_MKDIR; - exp_data.exp_notify = TRUE; - exp_data.path_1 = test_dirW; - exp_data.path_2 = NULL; - SHChangeNotify(SHCNE_MKDIR, SHCNF_PATHW | SHCNF_FLUSH, test_dirW, NULL); + exp_data->missing_events = exp_data->notify_count; + SHChangeNotify(exp_data->signal, SHCNF_PATHA | SHCNF_FLUSH, + strlen(exp_data->path_1) > 0 ? exp_data->path_1 : NULL, + strlen(exp_data->path_2) > 0 ? exp_data->path_2 : NULL); do_events(); - ok(exp_data.exp_notify == FALSE, "Expected wndproc to be called\n"); - }else - win_skip("skipping WCHAR tests\n"); - - exp_data.id = "MKDIR PATHA"; - exp_data.signal = SHCNE_MKDIR; - exp_data.exp_notify = TRUE; - exp_data.path_1 = test_dirW; - exp_data.path_2 = NULL; - SHChangeNotify(SHCNE_MKDIR, SHCNF_PATHA | SHCNF_FLUSH, test_dirA, NULL); - do_events(); - ok(exp_data.exp_notify == FALSE, "Expected wndproc to be called\n"); - - /* RMDIR */ - br = RemoveDirectoryA(test_dirA); - ok(br == TRUE, "RemoveDirectory failed: %d\n", GetLastError()); + ok(exp_data->missing_events == 0, "%s: Expected wndproc to be called\n", exp_data->id); - if(has_unicode){ - exp_data.id = "RMDIR PATHW"; - exp_data.signal = SHCNE_RMDIR; - exp_data.exp_notify = TRUE; - exp_data.path_1 = test_dirW; - exp_data.path_2 = NULL; - SHChangeNotify(SHCNE_RMDIR, SHCNF_PATHW | SHCNF_FLUSH, test_dirW, NULL); - do_events(); - ok(exp_data.exp_notify == FALSE, "Expected wndproc to be called\n"); - }else - win_skip("skipping WCHAR tests\n"); - - exp_data.id = "RMDIR PATHA"; - exp_data.signal = SHCNE_RMDIR; - exp_data.exp_notify = TRUE; - exp_data.path_1 = test_dirW; - exp_data.path_2 = NULL; - SHChangeNotify(SHCNE_RMDIR, SHCNF_PATHA | SHCNF_FLUSH, test_dirA, NULL); - do_events(); - ok(exp_data.exp_notify == FALSE, "Expected wndproc to be called\n"); + if(has_unicode){ + WCHAR *path1, *path2; + + path1 = make_wstr(exp_data->path_1); + path2 = make_wstr(exp_data->path_2); + + exp_data->missing_events = exp_data->notify_count; + SHChangeNotify(exp_data->signal, SHCNF_PATHW | SHCNF_FLUSH, path1, path2); + do_events(); + ok(exp_data->missing_events == 0, "%s: Expected wndproc to be called\n", exp_data->id); + } + } SHChangeNotifyDeregister(notifyID); DestroyWindow(wnd);

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/source /git/website
by Jeremy Newman Nov. 12, 2010

Nov. 12, 2010

Module: website Branch: master Commit: 834da2b05f35407c97cf277bc71d8ed5fb55a1d1 URL: http://source.winehq.org/git/website.git/?a=commit;h=834da2b05f35407c97cf27… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 12 17:56:33 2010 -0600 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

André Hentschel : Wine 1.3.7 freigegeben
by Jeremy Newman Nov. 12, 2010

Nov. 12, 2010

Module: website Branch: master Commit: 14790c8ac5c4087cc7939bbeaf7524808cfda423 URL: http://source.winehq.org/git/website.git/?a=commit;h=14790c8ac5c4087cc7939b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 12 21:16:50 2010 +0100 Wine 1.3.7 freigegeben --- news/de/2010111201.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/de/2010111201.xml b/news/de/2010111201.xml new file mode 100644 index 0000000..55ee118 --- /dev/null +++ b/news/de/2010111201.xml @@ -0,0 +1,18 @@ +<news> +<date>12. November 2010</date> +<title>Wine 1.3.7 freigegeben</title> +<body> + Die Entwicklungsversion 1.3.7 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.3.7">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Verbesserte Systemtray Unterstützung.</li> + <li>Bessere Unterstützung für Installer mit Assemblies.</li> + <li>Viele der msvcrt "secure" Funktionen implementiert.</li> + <li>Viele Behebungen der GStreamer Unterstützung.</li> + <li>Viele MSXML Verbesserungen.</li> + <li>Updates in den Übersetzungen.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.7.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.3.7
by Jeremy Newman Nov. 12, 2010

Nov. 12, 2010

Module: website Branch: master Commit: 0e782a96e92091a17bddce5329f1d6b16a7adced URL: http://source.winehq.org/git/website.git/?a=commit;h=0e782a96e92091a17bddce… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 12 21:10:16 2010 +0100 French translation for release 1.3.7 --- news/fr/2010111201.xml | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/news/fr/2010111201.xml b/news/fr/2010111201.xml new file mode 100644 index 0000000..b86376f --- /dev/null +++ b/news/fr/2010111201.xml @@ -0,0 +1,21 @@ +<news> +<date>12 novembre 2010</date> +<title>Sortie de Wine 1.3.7</title> +<body> + La version de développement 1.3.7 de Wine est à présent disponible. + <a href="{$root}/announce/1.3.7">Nouveautés</a> de cette version : +<ul> + <li>Meilleure prise en charge de la zone de notification système.</li> + <li>Prise en charge améliorée des programmes d'installation utilisant des assemblies.</li> + <li>Nombreuses fonctions msvcrt "sécurisées" implémentées.</li> + <li>Un tas de corrections dans le support GStreamer.</li> + <li>Nombreuses améliorations MSXML.</li> + <li>Mises à jour de traductions.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.3.7.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

André Hentschel : 404 Translated to German
by Jeremy Newman Nov. 12, 2010

Nov. 12, 2010

Module: website Branch: master Commit: 28a3cb88ab39221bf35213d50076ead3e27c86ba URL: http://source.winehq.org/git/website.git/?a=commit;h=28a3cb88ab39221bf35213… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 12 21:17:00 2010 +0100 404 Translated to German --- templates/de/global/404.template | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/templates/de/global/404.template b/templates/de/global/404.template new file mode 100644 index 0000000..e35532c --- /dev/null +++ b/templates/de/global/404.template @@ -0,0 +1,18 @@ + + + +<h1 class="title">404 Nicht gefunden</h1> + + + Entschuldigen Sie, das Dokument wurde nicht gefunden. Bitte prüfen Sie ihre URL + und versuchen es erneut. + + +<hr> + + + Wenn Sie einem Link auf der WineHQ.org Seite gefolgt sind und diese Seite erreichten, + melden Sie dies bitte im WineHQ.org + <a href="http://bugs.winehq.org/enter_bug.cgi?product=WineHQ.org">Bugzilla</a>. + +

1 0