September 2009 - Wine-Commits

Akihiro Sagawa : kernel32: Add Japanese system error messages.
by Alexandre Julliard Sept. 15, 2009

Sept. 15, 2009

Module: wine Branch: master Commit: c9be290e79673970306bd5dce390b42f210bf3d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9be290e79673970306bd5dce… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Sep 13 18:12:24 2009 +0900 kernel32: Add Japanese system error messages. --- .gitignore | 1 + dlls/kernel32/Makefile.in | 1 + dlls/kernel32/nls/winerr_jpn.mc | 3739 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 3741 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c9be290e79673970306bd…

1 0

Akihiro Sagawa : xcopy: Add Japanese translation.
by Alexandre Julliard Sept. 15, 2009

Sept. 15, 2009

Module: wine Branch: master Commit: 749972cebc6c0c7865e4ea2421af387e80b8f5d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=749972cebc6c0c7865e4ea242… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Sep 13 18:12:23 2009 +0900 xcopy: Add Japanese translation. --- programs/xcopy/Ja.rc | 83 ++++++++++++++++++++++++++++++++++++++++++++ programs/xcopy/Makefile.in | 1 + 2 files changed, 84 insertions(+), 0 deletions(-) diff --git a/programs/xcopy/Ja.rc b/programs/xcopy/Ja.rc new file mode 100644 index 0000000..38487af --- /dev/null +++ b/programs/xcopy/Ja.rc @@ -0,0 +1,83 @@ +/* + * XCOPY - Wine-compatible xcopy program + * Japanese language support + * + * Copyright (C) 2007 J. Edmeades + * Copyright (C) 2009 Akihiro Sagawa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "xcopy.h" + +#pragma code_page(65001) + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_INVPARMS, "パラメータの数が違います。xcopy /? で使い方を表示します\n" + STRING_INVPARM, "無効なパラメータ '%s' です。xcopy /? で使い方を表示します\n" + STRING_PAUSE, "コピーを開始するには <enter> を押してください\n" + STRING_SIMCOPY, "%d ファイルがコピーされる見込みです。\n" + STRING_COPY, "%d ファイルをコピーしました\n" + STRING_QISDIR, "送り先の '%s' はファイル名ですか、\n" \ + "ディレクトリですか?\n" \ + "(F - ファイル、D - ディレクトリ)\n" + STRING_SRCPROMPT,"%s? (Yes|No)\n" + STRING_OVERWRITE,"%s を上書きしますか? (Yes|No|All)\n" + STRING_COPYFAIL, "'%s' から '%s' へのコピーは失敗しました。戻り値 %d\n" + STRING_OPENFAIL, "'%s' を開けません\n" + STRING_READFAIL, "'%s' の読み込み中に失敗しました\n" + STRING_YES_CHAR, "Y" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "A" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "D" + + STRING_HELP, +"XCOPY - 送り元のファイルやディレクトリを送り先にコピーします\n\ +\n\ +構文:\n\ +XCOPY 送り元 [送り先] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +オプション:\n\ +\n\ +[/I] 送り先が存在せず、複数のファイルをコピーするときは、送り先を\n\ +\tディレクトリとみなします。\n\ +[/S] ディレクトリとサブディレクトリをコピーします。\n\ +[/E] 空ディレクトリを含め、ディレクトリとサブディレクトリをコピー。\n\ +[/Q] コピー中にファイル名を一覧にしません。すなわち寡黙です。\n\ +[/F] コピー中にフルパスで送り元と送り先の名前を表示します。\n\ +[/L] 操作を模擬実行し、コピー予定のファイル名を表示します。\n\ +[/W] コピーを開始する前に確認のメッセージを表示します。\n\ +[/T] 空のディレクトリ構造を作成しますが、ファイルはコピーしません。\n\ +[/Y] ファイルを上書きする時に確認のメッセージを表示しません。\n\ +[/-Y] ファイルを上書きする時に確認のメッセージを表示します。\n\ +[/P] 各ファイルのコピー前に確認のメッセージを表示します。\n\ +[/N] 短いファイル名を利用してコピーします。\n\ +[/U] 送り先にあるファイルだけコピーします。\n\ +[/R] 読み取り専用ファイルを上書きします。\n\ +[/H] 隠しファイルやシステムファイルもコピーします。\n\ +[/C] コピー中にエラーが起こっても続行します。\n\ +[/A] アーカイブ属性のファイルだけコピーします。\n\ +[/M] アーカイブ属性のファイルだけコピーし、アーカイブ属性を\n\ +\t取り除きます。\n\ +[/D | /D:月-日-年] 新しいファイルや指定された日付以降に変更された\n\ +\t\tファイルをコピーします。日付が指定されない場合は、\n\ +\t\tコピー先がコピー元より古いファイルだけコピーします。\n\n" + +} diff --git a/programs/xcopy/Makefile.in b/programs/xcopy/Makefile.in index b46a97f..088db0e 100644 --- a/programs/xcopy/Makefile.in +++ b/programs/xcopy/Makefile.in @@ -17,6 +17,7 @@ RC_SRCS = \ De.rc \ En.rc \ Fr.rc \ + Ja.rc \ Ko.rc \ Lt.rc \ Nl.rc \

1 0

Akihiro Sagawa : documentation: Update Japanese translation.
by Alexandre Julliard Sept. 15, 2009

Sept. 15, 2009

Module: wine Branch: master Commit: a70ae81a0a7a208d8ac1e74b57caa376a6368801 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a70ae81a0a7a208d8ac1e74b5… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Sep 13 18:12:20 2009 +0900 documentation: Update Japanese translation. --- documentation/README.ja | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/documentation/README.ja b/documentation/README.ja index 02f365e..0c4b814 100644 --- a/documentation/README.ja +++ b/documentation/README.ja @@ -30,10 +30,10 @@ READMEというファイル]を含む）Wineソースのトップレベルディ Wineをコンパイルし実行するには、以下のうち一つを持っていなければなりません: Linux バージョン2.0.36以上 - FreeBSD 7.0以上 - Solaris x86 9以上 + FreeBSD 6.3以降 + Solaris x86 9以降 NetBSD-current - Mac OS X 10.4以上 + Mac OS X 10.4以降動作するためにWineにはカーネルレベルのスレッドのサポートが必要なので、以上で触れたオペレーティングシステムだけがサポートされます。 @@ -46,8 +46,8 @@ Linux情報: あります）、2.4.xや2.6.xのような現在のカーネルを使うことが最適です。 FreeBSD情報: - FreeBSD 7.0以前のバージョン上でWineは次第に正しく動作しなくなるでしょう。 - FreeBSD 6.3にはWineを実行できるようにするパッチが利用できます。 + FreeBSD 6.3や7.0より前のバージョン上でWineは次第に正しく動作しなくなるで + しょう。FreeBSD 6.3にはWineを実行できるようにするパッチが利用できます。詳細については<http://wiki.freebsd.org/Wine>を参照してください。 Solaris情報: @@ -73,9 +73,9 @@ Mac OS X情報: 推奨されます。基本的な要件: - X11開発includeファイルをインストールする必要があります - （Debianではxlib6g-devでRed HatではXFree86-develと呼ばれます - [訳注: 最近のディストリビューションでは別のパッケージで置き換えられています]） + X11開発includeファイルをインストールする必要があります。 + （Debianではxlib6g-devでRed HatではXFree86-develと呼ばれます。[訳注: 最近の + ディストリビューションでは別のパッケージで置き換えられています]）もちろん"make"も必要です（大概はGNU make）。 @@ -139,8 +139,8 @@ Wineを起動するとき、実行可能ファイルのパス全体またはフ例えば、メモ帳を実行するには: - wine notepad （設定ファイルで指定された、ファイルを検索するための - wine notepad.exe 検索パスを使う） + wine notepad （設定ファイルで指定された、ファイルを検索 + wine notepad.exe するための検索パスを使う） wine c:\\windows\\notepad.exe （DOSファイル名の文法を使う） @@ -158,22 +158,22 @@ Wine Developer's Guide（Wine開発者のガイド）のデバッグの節を調 7. 更なる情報の取得 WWW: Wineについてのたくさんの情報がhttp://www.winehq.org/にある - WineHQから入手できます。多様なWineガイド、アプリケーションデータベース、 + WineHQから入手できます。多様なWineガイド、アプリケーションデータベース、バグ追跡。これはおそらく最良の出発点です。 FAQ: Wine FAQはhttp://www.winehq.org/FAQにあります Usenet: comp.emulators.ms-windows.wine上でWine関連の問題を議論し助けを - 得られます。 + 得られます。バグ: http://bugs.winehq.orgにあるWine Bugzillaでバグを報告してください。 - バグ報告を投稿する前に問題がすでにあるのかどうかを調べるために + バグ報告を投稿する前に問題がすでにあるのかどうかを調べるために bugzillaデータベースを検索してください。comp.emulators.ms-windows.wineにバグを投稿することもできます。 IRC: irc.freenode.net上のチャンネル#WineHQでオンラインヘルプを利用できます。 -GIT: 現在のWine開発ツリーはGITを通して入手できます。 +Git: 現在のWine開発ツリーはGitを通して入手できます。詳細についてはhttp://www.winehq.org/site/gitに行ってください。メーリングリスト:

1 0

Gerald Pfeifer : imm32/tests: Simplify code.
by Alexandre Julliard Sept. 15, 2009

Sept. 15, 2009

Module: wine Branch: master Commit: 902a03e08f4ae01efea5b242d028e68419d0409b URL: http://source.winehq.org/git/wine.git/?a=commit;h=902a03e08f4ae01efea5b242d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Sep 12 15:40:25 2009 +0200 imm32/tests: Simplify code. --- dlls/imm32/tests/imm32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index edda55b..db1cd8d 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -212,7 +212,7 @@ static void test_ImmNotifyIME(void) { /* behavior differs between win9x and NT */ ret = ImmGetCompositionString(imc, GCS_COMPSTR, resstr, sizeof(resstr)); - ok(ret || !ret, "You'll never read this.\n"); + ok(!ret, "After being cancelled the composition string is empty.\n"); msg_spy_flush_msgs();

1 0

Jörg Höhle : ddraw: Complete recognition of pixelformat 19: X8L8V8U8.
by Alexandre Julliard Sept. 15, 2009

Sept. 15, 2009

Module: wine Branch: master Commit: 3eb62ed62c4d8b69345e0a2e7d74a3684f500d7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eb62ed62c4d8b69345e0a2e7… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Aug 23 16:31:22 2009 +0200 ddraw: Complete recognition of pixelformat 19: X8L8V8U8. --- dlls/ddraw/utils.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 618dba4..90e8a95 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -325,6 +325,16 @@ PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, DDPixelFormat->u5.dwLuminanceAlphaBitMask = 0x00000000; break; + case WINED3DFMT_X8L8V8U8: + DDPixelFormat->dwFlags = DDPF_BUMPDUDV; + DDPixelFormat->dwFourCC = 0; + DDPixelFormat->u1.dwBumpBitCount = 32; + DDPixelFormat->u2.dwBumpDuBitMask = 0x000000ff; + DDPixelFormat->u3.dwBumpDvBitMask = 0x0000ff00; + DDPixelFormat->u4.dwBumpLuminanceBitMask = 0x00ff0000; + DDPixelFormat->u5.dwLuminanceAlphaBitMask = 0x00000000; + break; + default: ERR("Can't translate this Pixelformat %d\n", WineD3DFormat); } @@ -620,6 +630,13 @@ PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat) { return WINED3DFMT_L6V5U5; } + else if ( (DDPixelFormat->u1.dwBumpBitCount == 32 ) && + (DDPixelFormat->u2.dwBumpDuBitMask == 0x000000ff) && + (DDPixelFormat->u3.dwBumpDvBitMask == 0x0000ff00) && + (DDPixelFormat->u4.dwBumpLuminanceBitMask == 0x00ff0000) ) + { + return WINED3DFMT_X8L8V8U8; + } } ERR("Unknown Pixelformat!\n");

1 0

Paul Vriens : wininet/tests: Run tests again on systems with IE5.
by Alexandre Julliard Sept. 15, 2009

Sept. 15, 2009

Module: wine Branch: master Commit: 8b6ae91042c229b43b7228885a917caeee8d87e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b6ae91042c229b43b7228885… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Sep 13 17:45:18 2009 +0200 wininet/tests: Run tests again on systems with IE5. --- dlls/wininet/tests/internet.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 728c8dc..144c630 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -36,6 +36,8 @@ static BOOL (WINAPI *pInternetTimeFromSystemTimeW)(CONST SYSTEMTIME *,DWORD ,LPW static BOOL (WINAPI *pInternetTimeToSystemTimeA)(LPCSTR ,SYSTEMTIME *,DWORD); static BOOL (WINAPI *pInternetTimeToSystemTimeW)(LPCWSTR ,SYSTEMTIME *,DWORD); static BOOL (WINAPI *pIsDomainLegalCookieDomainW)(LPCWSTR, LPCWSTR); +static DWORD (WINAPI *pPrivacyGetZonePreferenceW)(DWORD, DWORD, LPDWORD, LPWSTR, LPDWORD); +static DWORD (WINAPI *pPrivacySetZonePreferenceW)(DWORD, DWORD, DWORD, LPCWSTR); /* ############################### */ @@ -801,24 +803,24 @@ static void test_PrivacyGetSetZonePreferenceW(void) zone = 3; type = 0; - ret = PrivacyGetZonePreferenceW(zone, type, NULL, NULL, NULL); + ret = pPrivacyGetZonePreferenceW(zone, type, NULL, NULL, NULL); ok(ret == 0, "expected ret == 0, got %u\n", ret); old_template = 0; - ret = PrivacyGetZonePreferenceW(zone, type, &old_template, NULL, NULL); + ret = pPrivacyGetZonePreferenceW(zone, type, &old_template, NULL, NULL); ok(ret == 0, "expected ret == 0, got %u\n", ret); template = 5; - ret = PrivacySetZonePreferenceW(zone, type, template, NULL); + ret = pPrivacySetZonePreferenceW(zone, type, template, NULL); ok(ret == 0, "expected ret == 0, got %u\n", ret); template = 0; - ret = PrivacyGetZonePreferenceW(zone, type, &template, NULL, NULL); + ret = pPrivacyGetZonePreferenceW(zone, type, &template, NULL, NULL); ok(ret == 0, "expected ret == 0, got %u\n", ret); ok(template == 5, "expected template == 5, got %u\n", template); template = 5; - ret = PrivacySetZonePreferenceW(zone, type, old_template, NULL); + ret = pPrivacySetZonePreferenceW(zone, type, old_template, NULL); ok(ret == 0, "expected ret == 0, got %u\n", ret); } @@ -835,6 +837,8 @@ START_TEST(internet) pInternetTimeToSystemTimeA = (void*)GetProcAddress(hdll, "InternetTimeToSystemTimeA"); pInternetTimeToSystemTimeW = (void*)GetProcAddress(hdll, "InternetTimeToSystemTimeW"); pIsDomainLegalCookieDomainW = (void*)GetProcAddress(hdll, (LPCSTR)117); + pPrivacyGetZonePreferenceW = (void*)GetProcAddress(hdll, "PrivacyGetZonePreferenceW"); + pPrivacySetZonePreferenceW = (void*)GetProcAddress(hdll, "PrivacySetZonePreferenceW"); test_InternetCanonicalizeUrlA(); test_InternetQueryOptionA(); @@ -861,5 +865,8 @@ START_TEST(internet) else test_IsDomainLegalCookieDomainW(); - test_PrivacyGetSetZonePreferenceW(); + if (pPrivacyGetZonePreferenceW && pPrivacySetZonePreferenceW) + test_PrivacyGetSetZonePreferenceW(); + else + win_skip("Privacy[SG]etZonePreferenceW are not available\n"); }

1 0

Detlef Riekenberg : libs/port: use gcc compatible asm code as default for __i386__ (for PCC).
by Alexandre Julliard Sept. 15, 2009

Sept. 15, 2009

Module: wine Branch: master Commit: c8d860b31e09dcebf7e960a4c6a7f2e6c8830ecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8d860b31e09dcebf7e960a4c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Sep 12 18:17:56 2009 +0200 libs/port: use gcc compatible asm code as default for __i386__ (for PCC). --- libs/port/interlocked.c | 103 +++++++++++++++++++++++------------------------ 1 files changed, 51 insertions(+), 52 deletions(-) diff --git a/libs/port/interlocked.c b/libs/port/interlocked.c index c2ac3eb..51794d3 100644 --- a/libs/port/interlocked.c +++ b/libs/port/interlocked.c @@ -24,57 +24,7 @@ #ifdef __i386__ -#ifdef __GNUC__ - -__ASM_GLOBAL_FUNC(interlocked_cmpxchg, - "movl 12(%esp),%eax\n\t" - "movl 8(%esp),%ecx\n\t" - "movl 4(%esp),%edx\n\t" - "lock; cmpxchgl %ecx,(%edx)\n\t" - "ret") -__ASM_GLOBAL_FUNC(interlocked_cmpxchg_ptr, - "movl 12(%esp),%eax\n\t" - "movl 8(%esp),%ecx\n\t" - "movl 4(%esp),%edx\n\t" - "lock; cmpxchgl %ecx,(%edx)\n\t" - "ret") - __ASM_GLOBAL_FUNC(interlocked_cmpxchg64, - "push %ebx\n\t" - __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") - __ASM_CFI(".cfi_rel_offset %ebx,0\n\t") - "push %esi\n\t" - __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") - __ASM_CFI(".cfi_rel_offset %esi,0\n\t") - "movl 12(%esp),%esi\n\t" - "movl 16(%esp),%ebx\n\t" - "movl 20(%esp),%ecx\n\t" - "movl 24(%esp),%eax\n\t" - "movl 28(%esp),%edx\n\t" - "lock; cmpxchg8b (%esi)\n\t" - "pop %esi\n\t" - __ASM_CFI(".cfi_same_value %esi\n\t") - __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") - "pop %ebx\n\t" - __ASM_CFI(".cfi_same_value %ebx\n\t") - __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") - "ret") -__ASM_GLOBAL_FUNC(interlocked_xchg, - "movl 8(%esp),%eax\n\t" - "movl 4(%esp),%edx\n\t" - "lock; xchgl %eax,(%edx)\n\t" - "ret") -__ASM_GLOBAL_FUNC(interlocked_xchg_ptr, - "movl 8(%esp),%eax\n\t" - "movl 4(%esp),%edx\n\t" - "lock; xchgl %eax,(%edx)\n\t" - "ret") -__ASM_GLOBAL_FUNC(interlocked_xchg_add, - "movl 8(%esp),%eax\n\t" - "movl 4(%esp),%edx\n\t" - "lock; xaddl %eax,(%edx)\n\t" - "ret") - -#elif defined(_MSC_VER) +#if defined(_MSC_VER) __declspec(naked) int interlocked_cmpxchg( int *dest, int xchg, int compare ) { @@ -134,7 +84,56 @@ __declspec(naked) int interlocked_xchg_add( int *dest, int incr ) } #else -# error You must implement the interlocked* functions for your compiler +/* use gcc compatible asm code as default for __i386__ */ + +__ASM_GLOBAL_FUNC(interlocked_cmpxchg, + "movl 12(%esp),%eax\n\t" + "movl 8(%esp),%ecx\n\t" + "movl 4(%esp),%edx\n\t" + "lock; cmpxchgl %ecx,(%edx)\n\t" + "ret") +__ASM_GLOBAL_FUNC(interlocked_cmpxchg_ptr, + "movl 12(%esp),%eax\n\t" + "movl 8(%esp),%ecx\n\t" + "movl 4(%esp),%edx\n\t" + "lock; cmpxchgl %ecx,(%edx)\n\t" + "ret") + __ASM_GLOBAL_FUNC(interlocked_cmpxchg64, + "push %ebx\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebx,0\n\t") + "push %esi\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %esi,0\n\t") + "movl 12(%esp),%esi\n\t" + "movl 16(%esp),%ebx\n\t" + "movl 20(%esp),%ecx\n\t" + "movl 24(%esp),%eax\n\t" + "movl 28(%esp),%edx\n\t" + "lock; cmpxchg8b (%esi)\n\t" + "pop %esi\n\t" + __ASM_CFI(".cfi_same_value %esi\n\t") + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") + "pop %ebx\n\t" + __ASM_CFI(".cfi_same_value %ebx\n\t") + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") + "ret") +__ASM_GLOBAL_FUNC(interlocked_xchg, + "movl 8(%esp),%eax\n\t" + "movl 4(%esp),%edx\n\t" + "lock; xchgl %eax,(%edx)\n\t" + "ret") +__ASM_GLOBAL_FUNC(interlocked_xchg_ptr, + "movl 8(%esp),%eax\n\t" + "movl 4(%esp),%edx\n\t" + "lock; xchgl %eax,(%edx)\n\t" + "ret") +__ASM_GLOBAL_FUNC(interlocked_xchg_add, + "movl 8(%esp),%eax\n\t" + "movl 4(%esp),%edx\n\t" + "lock; xaddl %eax,(%edx)\n\t" + "ret") + #endif #elif defined(__x86_64__)

1 0

Detlef Riekenberg : include: Add a missing semicolon (splint).
by Alexandre Julliard Sept. 15, 2009

Sept. 15, 2009

Module: wine Branch: master Commit: 1227722b2521a311e5c14e4196a4fe922b542402 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1227722b2521a311e5c14e419… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Sep 12 17:55:21 2009 +0200 include: Add a missing semicolon (splint). --- include/shlobj.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/shlobj.h b/include/shlobj.h index c24c29c..15128c7 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -217,7 +217,7 @@ static const WCHAR CFSTR_FILEDESCRIPTORW[] = static const WCHAR CFSTR_FILECONTENTSW[] = { 'F','i','l','e','C','o','n','t','e','n','t','s',0 }; static const WCHAR CFSTR_FILENAMEW[] = - { 'F','i','l','e','N','a','m','e','W',0 } + { 'F','i','l','e','N','a','m','e','W',0 }; static const WCHAR CFSTR_FILENAMEMAPW[] = { 'F','i','l','e','N','a','m','e','M','a','p','W',0 }; static const WCHAR CFSTR_PRINTERGROUPW[] =

1 0

André Hentschel : winemaker: Update manpage.
by Alexandre Julliard Sept. 15, 2009

Sept. 15, 2009

Module: wine Branch: master Commit: d912d6fb4deec8b94e67adfdbda4dfa1676cc5b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d912d6fb4deec8b94e67adfdb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Sep 12 14:37:40 2009 +0200 winemaker: Update manpage. --- tools/winemaker.man.in | 36 ++++++++++++++++++++++-------------- 1 files changed, 22 insertions(+), 14 deletions(-) diff --git a/tools/winemaker.man.in b/tools/winemaker.man.in index f0e8aed..cdfd49a 100644 --- a/tools/winemaker.man.in +++ b/tools/winemaker.man.in @@ -1,5 +1,5 @@ .\" -*- nroff -*- -.TH WINEMAKER 1 "Aug 2009" "@PACKAGE_STRING@" "Wine Developers Manual" +.TH WINEMAKER 1 "Sep 2009" "@PACKAGE_STRING@" "Wine Developers Manual" .SH NAME winemaker \- generate a build infrastructure for compiling Windows programs on Unix .SH SYNOPSIS @@ -17,7 +17,7 @@ winemaker \- generate a build infrastructure for compiling Windows programs on U ] .br [ -.IR "--guiexe " "| " "--windows " "| " "--cuiexe " "| " "--console " "| " "--dll " "| " "--nodlls " +.IR "--guiexe " "| " "--windows " "| " "--cuiexe " "| " "--console " "| " "--dll " ] .br [ @@ -25,7 +25,7 @@ winemaker \- generate a build infrastructure for compiling Windows programs on U ] .br [ -.IR "--interactive " "] [ " "--single-target name " +.IR "--nodlls " "] [ " "--nomsvcrt " "] [ " "--interactive " "] [ " "--single-target name " ] .br [ @@ -123,14 +123,6 @@ This option tells winemaker that whenever it finds a target of unknown type, i.e. for which it does not know whether it is an executable or a library, it should assume it is a library. .TP -.I --nodlls -This option tells winemaker not to use the standard set of winelib libraries -for imports. That is, any DLL your code uses must be explicitly passed to -winemaker with -i options. -The standard set of libraries is: advapi32.dll, comdlg32.dll, gdi32.dll, -kernel32.dll, odbc32.dll, ole32.dll, oleaut32.dll, shell32.dll, user32.dll, -winspool.drv. -.TP .I --mfc Specifies that the targets are MFC based. In such a case winemaker the include and library paths accordingly, and links the target with the MFC library. @@ -158,6 +150,17 @@ Appends the specified directory to the global library path. .I -llibrary Adds the specified library to the global list of libraries to link with. .TP +.I --nodlls +This option tells winemaker not to use the standard set of winelib libraries +for imports. That is, any DLL your code uses must be explicitly passed to +winemaker with -i options. +The standard set of libraries is: odbc32.dll, odbccp32.dll, ole32.dll, +oleaut32.dll and winspool.drv. +.TP +.I --nomsvcrt +Sets some options to tell winegcc not to compile against msvcrt. +Use this option if you have cpp-files that include <string>. +.TP .I --interactive Puts winemaker in interactive mode. In this mode winemaker will ask you to confirm each directory's list of targets, and then to provide directory and @@ -204,7 +207,7 @@ $ make .PP For an existing project-file you would have to run the following commands: .PP -$ winemaker --lower-all myproject.dsp +$ winemaker myproject.dsp .br $ make .PP @@ -235,5 +238,10 @@ http://www.winehq.org/docs/winelib-guide/index .BR wine (1) .PP -.SH AUTHOR -Francois Gouget <fgouget(a)codeweavers.com> for CodeWeavers +.SH AUTHORS +François Gouget for CodeWeavers +.PP +Dimitrie O. Paun +.PP +André Hentschel +.PP

1 0

Michael Karcher : ntdll: Fix DEP status initialization.
by Alexandre Julliard Sept. 15, 2009

Sept. 15, 2009

Module: wine Branch: master Commit: be90ae2fc3174c8e7c4894427cc0f09b3a92f1e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be90ae2fc3174c8e7c4894427… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sat Sep 12 01:27:42 2009 +0200 ntdll: Fix DEP status initialization. --- dlls/ntdll/loader.c | 3 ++- dlls/ntdll/process.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index df4bb01..76f0e5d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -809,8 +809,9 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename ) if (!(nt->OptionalHeader.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_NX_COMPAT)) { + ULONG flags = MEM_EXECUTE_OPTION_ENABLE; WARN( "disabling no-exec because of %s\n", debugstr_w(wm->ldr.BaseDllName.Buffer) ); - VIRTUAL_SetForceExec( TRUE ); + NtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &flags, sizeof(flags) ); } return wm; } diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 2f86e2d..573ee86 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); -static ULONG execute_flags = MEM_EXECUTE_OPTION_ENABLE; +static ULONG execute_flags = MEM_EXECUTE_OPTION_DISABLE; /* * Process object

1 0