November 2011 - Wine-commits

Andrew Talbot : windowscodecs: Remove unneeded address-of operators from array names.
by Alexandre Julliard 02 Nov '11

02 Nov '11

Module: wine Branch: master Commit: e1b7291785e7b9059cca6f2fc1a9c9439093e683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1b7291785e7b9059cca6f2fc… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 1 22:51:46 2011 +0000 windowscodecs: Remove unneeded address-of operators from array names. --- dlls/windowscodecs/jpegformat.c | 4 ++-- dlls/windowscodecs/pngformat.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 083a352..0cb9fc2 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -284,7 +284,7 @@ static HRESULT WINAPI JpegDecoder_Initialize(IWICBitmapDecoder *iface, IStream * This->cinfo.err = &This->jerr; - This->cinfo.client_data = &jmpbuf; + This->cinfo.client_data = jmpbuf; if (setjmp(jmpbuf)) { @@ -576,7 +576,7 @@ static HRESULT WINAPI JpegDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, } } - This->cinfo.client_data = &jmpbuf; + This->cinfo.client_data = jmpbuf; if (setjmp(jmpbuf)) { diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index c7c3cab..ce99509 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -304,7 +304,7 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p hr = E_FAIL; goto end; } - ppng_set_error_fn(This->png_ptr, &jmpbuf, user_error_fn, user_warning_fn); + ppng_set_error_fn(This->png_ptr, jmpbuf, user_error_fn, user_warning_fn); /* seek to the start of the stream */ seek.QuadPart = 0; @@ -1015,7 +1015,7 @@ static HRESULT WINAPI PngFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, HeapFree(GetProcessHeap(), 0, row_pointers); return E_FAIL; } - ppng_set_error_fn(This->png_ptr, &jmpbuf, user_error_fn, user_warning_fn); + ppng_set_error_fn(This->png_ptr, jmpbuf, user_error_fn, user_warning_fn); if (!This->info_written) { @@ -1153,7 +1153,7 @@ static HRESULT WINAPI PngFrameEncode_Commit(IWICBitmapFrameEncode *iface) LeaveCriticalSection(&This->lock); return E_FAIL; } - ppng_set_error_fn(This->png_ptr, &jmpbuf, user_error_fn, user_warning_fn); + ppng_set_error_fn(This->png_ptr, jmpbuf, user_error_fn, user_warning_fn); ppng_write_end(This->png_ptr, This->info_ptr); @@ -1305,7 +1305,7 @@ static HRESULT WINAPI PngEncoder_Initialize(IWICBitmapEncoder *iface, LeaveCriticalSection(&This->lock); return E_FAIL; } - ppng_set_error_fn(This->png_ptr, &jmpbuf, user_error_fn, user_warning_fn); + ppng_set_error_fn(This->png_ptr, jmpbuf, user_error_fn, user_warning_fn); /* set up custom i/o handling */ ppng_set_write_fn(This->png_ptr, This, user_write_data, user_flush);

1 0

Vitaliy Margolen : dinput: Window supplied to SetCooperativeLevel have to be top level window.
by Alexandre Julliard 02 Nov '11

02 Nov '11

Module: wine Branch: master Commit: 8c5a4401449efc52f7309f7b8f45182138b4e13c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c5a4401449efc52f7309f7b8… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue Nov 1 23:45:39 2011 -0600 dinput: Window supplied to SetCooperativeLevel have to be top level window. --- dlls/dinput/device.c | 2 ++ dlls/dinput/tests/keyboard.c | 18 ++++++++++++++++++ dlls/dinput/tests/mouse.c | 18 ++++++++++++++++++ 3 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 72670f7..f5b7b4b 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -882,6 +882,8 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetCooperativeLevel(LPDIRECTINPUTDEVICE8 (dwflags & (DISCL_FOREGROUND | DISCL_BACKGROUND)) == (DISCL_FOREGROUND | DISCL_BACKGROUND)) return DIERR_INVALIDPARAM; + if (hwnd && GetWindowLongW(hwnd, GWL_STYLE) & WS_CHILD) return E_HANDLE; + if (dwflags == (DISCL_NONEXCLUSIVE | DISCL_BACKGROUND)) hwnd = GetDesktopWindow(); diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index ecfd6c2..4b46a61 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -106,11 +106,18 @@ static const HRESULT SetCoop_real_window[16] = { E_INVALIDARG, E_NOTIMPL, S_OK, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; +static const HRESULT SetCoop_child_window[16] = { + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, + E_INVALIDARG, E_HANDLE, E_HANDLE, E_INVALIDARG, + E_INVALIDARG, E_HANDLE, E_HANDLE, E_INVALIDARG, + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; + static void test_set_coop(LPDIRECTINPUT pDI, HWND hwnd) { HRESULT hr; LPDIRECTINPUTDEVICE pKeyboard = NULL; int i; + HWND child; hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &pKeyboard, NULL); ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); @@ -127,6 +134,17 @@ static void test_set_coop(LPDIRECTINPUT pDI, HWND hwnd) ok(hr == SetCoop_real_window[i], "SetCooperativeLevel(hwnd, %d): %08x\n", i, hr); } + child = CreateWindow("static", "Title", WS_CHILD | WS_VISIBLE, + 10, 10, 50, 50, hwnd, NULL, NULL, NULL); + ok(child != NULL, "err: %d\n", GetLastError()); + + for (i=0; i<16; i++) + { + hr = IDirectInputDevice_SetCooperativeLevel(pKeyboard, child, i); + ok(hr == SetCoop_child_window[i], "SetCooperativeLevel(child, %d): %08x\n", i, hr); + } + + DestroyWindow(child); if (pKeyboard) IUnknown_Release(pKeyboard); } diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index 0d6b88a..2cfb8cd 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -42,11 +42,18 @@ static const HRESULT SetCoop_real_window[16] = { E_INVALIDARG, E_NOTIMPL, S_OK, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; +static const HRESULT SetCoop_child_window[16] = { + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, + E_INVALIDARG, E_HANDLE, E_HANDLE, E_INVALIDARG, + E_INVALIDARG, E_HANDLE, E_HANDLE, E_INVALIDARG, + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; + static void test_set_coop(LPDIRECTINPUT pDI, HWND hwnd) { HRESULT hr; LPDIRECTINPUTDEVICE pMouse = NULL; int i; + HWND child; hr = IDirectInput_CreateDevice(pDI, &GUID_SysMouse, &pMouse, NULL); ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); @@ -63,6 +70,17 @@ static void test_set_coop(LPDIRECTINPUT pDI, HWND hwnd) ok(hr == SetCoop_real_window[i], "SetCooperativeLevel(hwnd, %d): %08x\n", i, hr); } + child = CreateWindow("static", "Title", WS_CHILD | WS_VISIBLE, + 10, 10, 50, 50, hwnd, NULL, NULL, NULL); + ok(child != NULL, "err: %d\n", GetLastError()); + + for (i=0; i<16; i++) + { + hr = IDirectInputDevice_SetCooperativeLevel(pMouse, child, i); + ok(hr == SetCoop_child_window[i], "SetCooperativeLevel(child, %d): %08x\n", i, hr); + } + + DestroyWindow(child); if (pMouse) IUnknown_Release(pMouse); }

1 0

Alistair Leslie-Hughes : mscoree: Return S_OK from CanLaunchOrAttach.
by Alexandre Julliard 02 Nov '11

02 Nov '11

Module: wine Branch: master Commit: 5dcd363f5a2c50dca412b50500affdda346482af URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dcd363f5a2c50dca412b5050… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Oct 18 10:39:47 2011 +1100 mscoree: Return S_OK from CanLaunchOrAttach. --- dlls/mscoree/cordebug.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/cordebug.c b/dlls/mscoree/cordebug.c index 04c6e58..8fe7501 100644 --- a/dlls/mscoree/cordebug.c +++ b/dlls/mscoree/cordebug.c @@ -314,7 +314,7 @@ static HRESULT WINAPI CorDebug_CanLaunchOrAttach(ICorDebug *iface, DWORD dwProce { CorDebug *This = impl_from_ICorDebug( iface ); FIXME("stub %p %d %d\n", This, dwProcessId, win32DebuggingEnabled); - return E_NOTIMPL; + return S_OK; } static const struct ICorDebugVtbl cordebug_vtbl =

1 0

Alexandre Julliard : wineconsole: Convert dialogs to po files.
by Alexandre Julliard 02 Nov '11

02 Nov '11

Module: wine Branch: master Commit: 8715df8ecd45f2c403ba0d011480e4751212bf9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8715df8ecd45f2c403ba0d011… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 2 14:28:22 2011 +0100 wineconsole: Convert dialogs to po files. --- po/ar.po | 143 +++++++++++++++++++++- po/bg.po | 146 +++++++++++++++++++++- po/ca.po | 156 +++++++++++++++++++++++- po/cs.po | 135 ++++++++++++++++++++- po/da.po | 135 ++++++++++++++++++++- po/de.po | 135 ++++++++++++++++++++- po/el.po | 143 +++++++++++++++++++++- po/en.po | 137 ++++++++++++++++++++-- po/en_US.po | 135 ++++++++++++++++++++- po/eo.po | 135 ++++++++++++++++++++- po/es.po | 135 ++++++++++++++++++++- po/fa.po | 143 +++++++++++++++++++++- po/fi.po | 149 ++++++++++++++++++++++- po/fr.po | 135 ++++++++++++++++++++- po/he.po | 135 ++++++++++++++++++++- po/hi.po | 137 ++++++++++++++++++++- po/hu.po | 135 ++++++++++++++++++++- po/it.po | 135 ++++++++++++++++++++- po/ja.po | 135 ++++++++++++++++++++- po/ko.po | 135 ++++++++++++++++++++- po/lt.po | 135 ++++++++++++++++++++- po/ml.po | 137 ++++++++++++++++++++- po/nb_NO.po | 135 ++++++++++++++++++++- po/nl.po | 135 ++++++++++++++++++++- po/or.po | 137 ++++++++++++++++++++- po/pa.po | 137 ++++++++++++++++++++- po/pl.po | 135 ++++++++++++++++++++- po/pt_BR.po | 135 ++++++++++++++++++++- po/pt_PT.po | 135 ++++++++++++++++++++- po/rm.po | 141 +++++++++++++++++++++- po/ro.po | 135 ++++++++++++++++++++- po/ru.po | 135 ++++++++++++++++++++- po/sk.po | 140 ++++++++++++++++++++- po/sl.po | 135 ++++++++++++++++++++- po/sr_RS(a)cyrillic.po | 153 ++++++++++++++++++++++- po/sr_RS(a)latin.po | 159 +++++++++++++++++++++++- po/sv.po | 135 ++++++++++++++++++++- po/te.po | 137 ++++++++++++++++++++- po/th.po | 143 +++++++++++++++++++++- po/tr.po | 135 ++++++++++++++++++++- po/uk.po | 135 ++++++++++++++++++++- po/wa.po | 146 +++++++++++++++++++++- po/wine.pot | 135 ++++++++++++++++++++- po/zh_CN.po | 135 ++++++++++++++++++++- po/zh_TW.po | 135 ++++++++++++++++++++- programs/wineconsole/Makefile.in | 28 +---- programs/wineconsole/wineconsole.rc | 80 ++++++++++++ programs/wineconsole/wineconsole_Cs.rc | 107 ---------------- programs/wineconsole/wineconsole_Da.rc | 105 ---------------- programs/wineconsole/wineconsole_De.rc | 104 ---------------- programs/wineconsole/wineconsole_En.rc | 120 ------------------ programs/wineconsole/wineconsole_Eo.rc | 104 ---------------- programs/wineconsole/wineconsole_Es.rc | 105 ---------------- programs/wineconsole/wineconsole_Fr.rc | 107 ---------------- programs/wineconsole/wineconsole_He.rc | 109 ----------------- programs/wineconsole/wineconsole_Hu.rc | 103 ---------------- programs/wineconsole/wineconsole_It.rc | 105 ---------------- programs/wineconsole/wineconsole_Ja.rc | 106 ---------------- programs/wineconsole/wineconsole_Ko.rc | 105 ---------------- programs/wineconsole/wineconsole_Lt.rc | 105 ---------------- programs/wineconsole/wineconsole_Nl.rc | 105 ---------------- programs/wineconsole/wineconsole_No.rc | 105 ---------------- programs/wineconsole/wineconsole_Pl.rc | 103 ---------------- programs/wineconsole/wineconsole_Pt.rc | 207 -------------------------------- programs/wineconsole/wineconsole_Ro.rc | 106 ---------------- programs/wineconsole/wineconsole_Ru.rc | 108 ----------------- programs/wineconsole/wineconsole_Si.rc | 104 ---------------- programs/wineconsole/wineconsole_Sv.rc | 102 ---------------- programs/wineconsole/wineconsole_Tr.rc | 104 ---------------- programs/wineconsole/wineconsole_Uk.rc | 106 ---------------- programs/wineconsole/wineconsole_Zh.rc | 192 ----------------------------- 71 files changed, 5994 insertions(+), 3070 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8715df8ecd45f2c403ba0…

1 0

André Hentschel : dbghelp: Use ARMv7 for debugging.
by Alexandre Julliard 02 Nov '11

02 Nov '11

Module: wine Branch: master Commit: c486cec0d64cd4be188304641dd022dd5d4404b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c486cec0d64cd4be188304641… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 1 16:41:43 2011 +0100 dbghelp: Use ARMv7 for debugging. --- dlls/dbghelp/cpu_arm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/cpu_arm.c b/dlls/dbghelp/cpu_arm.c index 536d21d..413a492 100644 --- a/dlls/dbghelp/cpu_arm.c +++ b/dlls/dbghelp/cpu_arm.c @@ -223,7 +223,7 @@ static const char* arm_fetch_regname(unsigned regno) } DECLSPEC_HIDDEN struct cpu cpu_arm = { - IMAGE_FILE_MACHINE_ARM, + IMAGE_FILE_MACHINE_ARMV7, 4, CV_ARM_R0 + 11, arm_get_addr,

1 0

Austin English : wininet: Add a stub for RunOnceUrlCache.
by Alexandre Julliard 02 Nov '11

02 Nov '11

Module: wine Branch: master Commit: 9536a9cc1b30d70874bb50aaf9b16afbcd443dc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9536a9cc1b30d70874bb50aaf… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Nov 1 11:14:16 2011 -0700 wininet: Add a stub for RunOnceUrlCache. --- dlls/wininet/urlcache.c | 10 ++++++++++ dlls/wininet/wininet.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index cec5bbb..a217236 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -3925,3 +3925,13 @@ BOOL WINAPI IncrementUrlCacheHeaderData(DWORD index, LPDWORD data) FIXME("(%u, %p)\n", index, data); return FALSE; } + +/*********************************************************************** + * RunOnceUrlCache (WININET.@) + */ + +DWORD WINAPI RunOnceUrlCache(HWND hwnd, HINSTANCE hinst, LPSTR cmd, int cmdshow) +{ + FIXME("(%p, %p, %s, %d): stub\n", hwnd, hinst, debugstr_a(cmd), cmdshow); + return 0; +} diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index 82b0d7d..2773d4b 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -222,7 +222,7 @@ @ stdcall RetrieveUrlCacheEntryFileW(wstr ptr ptr long) @ stdcall RetrieveUrlCacheEntryStreamA(str ptr ptr long long) @ stdcall RetrieveUrlCacheEntryStreamW(wstr ptr ptr long long) -@ stub RunOnceUrlCache +@ stdcall RunOnceUrlCache(ptr ptr str long) @ stdcall SetUrlCacheConfigInfoA(ptr long) @ stdcall SetUrlCacheConfigInfoW(ptr long) @ stdcall SetUrlCacheEntryGroup(str long int64 ptr long ptr) SetUrlCacheEntryGroupA

1 0

André Hentschel : ntdll: Only load ARMv7 PE images when supported by CPU.
by Alexandre Julliard 02 Nov '11

02 Nov '11

Module: wine Branch: master Commit: 41e188f1481fbcfb4b2851df6834495194633057 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41e188f1481fbcfb4b2851df6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 1 19:32:57 2011 +0100 ntdll: Only load ARMv7 PE images when supported by CPU. --- dlls/ntdll/virtual.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 3d75fa1..b23e596 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1055,8 +1055,10 @@ static NTSTATUS check_architecture( const IMAGE_NT_HEADERS *nt ) return STATUS_INVALID_IMAGE_FORMAT; } #elif defined(__arm__) && !defined(__ARMEB__) - if (nt->FileHeader.Machine == IMAGE_FILE_MACHINE_ARMV7 || - nt->FileHeader.Machine == IMAGE_FILE_MACHINE_ARM || + if (nt->FileHeader.Machine == IMAGE_FILE_MACHINE_ARM || +#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7R__) + nt->FileHeader.Machine == IMAGE_FILE_MACHINE_ARMV7 || +#endif nt->FileHeader.Machine == IMAGE_FILE_MACHINE_THUMB) return STATUS_SUCCESS; #endif

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard 02 Nov '11

02 Nov '11

Module: wine Branch: master Commit: 9893222184fe995d84397f4a0d0c9031056d0881 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9893222184fe995d84397f4a0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 1 19:37:33 2011 +0100 po: Update German translation. --- po/de.po | 107 +++++++++++++++++++------------------------------------------- 1 files changed, 33 insertions(+), 74 deletions(-) diff --git a/po/de.po b/po/de.po index f6b0533..3fb251b 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-10-01 18:05+0200\n" +"PO-Revision-Date: 2011-11-01 14:03+0100\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -5916,17 +5916,12 @@ msgstr "Als Desktopelement einrichten..." #: shdoclc.rc:46 shdoclc.rc:95 shdoclc.rc:117 user32.rc:62 msgid "Select &All" -msgstr "&Alles markieren" +msgstr "Alles &markieren" #: shdoclc.rc:47 shdoclc.rc:79 shdoclc.rc:92 shdoclc.rc:132 shdoclc.rc:159 #: shdoclc.rc:183 user32.rc:59 wineconsole.rc:30 wordpad.rc:103 -#, fuzzy msgid "&Paste" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"E&infügen\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"&Einfügen" +msgstr "E&infügen" #: shdoclc.rc:49 msgid "Create Shor&tcut" @@ -5966,7 +5961,7 @@ msgstr "&Drucke Ziel" #: shdoclc.rc:68 shdoclc.rc:151 shdoclc.rc:175 msgid "S&how Picture" -msgstr "Zeige B&ild" +msgstr "Zeige Bi&ld" #: shdoclc.rc:69 shdoclc.rc:176 msgid "&Save Picture As..." @@ -5994,13 +5989,8 @@ msgstr "Als Desktopelement einrichten..." #: shdoclc.rc:76 shdoclc.rc:90 shdoclc.rc:114 shdoclc.rc:156 shdoclc.rc:180 #: user32.rc:57 wordpad.rc:101 -#, fuzzy msgid "Cu&t" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Aus&schneiden\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"&Ausschneiden" +msgstr "&Ausschneiden" #: shdoclc.rc:77 shdoclc.rc:91 shdoclc.rc:115 shdoclc.rc:130 shdoclc.rc:157 #: shdoclc.rc:181 shell32.rc:99 user32.rc:58 wineconsole.rc:29 winhlp32.rc:37 @@ -6070,7 +6060,7 @@ msgstr "Im &neuen Fenster öffnen" #: shdoclc.rc:129 msgid "Cut" -msgstr "Aus&schneiden" +msgstr "Ausschneiden" #: shdoclc.rc:152 msgid "&Save Video As..." @@ -6748,9 +6738,8 @@ msgid "Trash" msgstr "Papierkorb" #: shlwapi.rc:27 -#, fuzzy msgid "%d bytes" -msgstr "%ld Bytes" +msgstr "%d Bytes" #: shlwapi.rc:28 msgctxt "time unit: hours" @@ -7726,9 +7715,8 @@ msgstr "" "\n" #: attrib.rc:28 -#, fuzzy msgid "%1: File Not Found\n" -msgstr "%s : Datei nicht gefunden\n" +msgstr "%1 : Datei nicht gefunden\n" #: attrib.rc:47 msgid "" @@ -8525,9 +8513,8 @@ msgid "PATH not found\n" msgstr "PATH nicht gefunden\n" #: cmd.rc:321 -#, fuzzy msgid "Press any key to continue... " -msgstr "Drücken Sie die Eingabetaste um fortzufahren: " +msgstr "Drücken Sie eine Taste um fortzufahren... " #: cmd.rc:322 msgid "Wine Command Prompt" @@ -8686,14 +8673,12 @@ msgstr "" "Der angegebene Dienst wird gestoppt.\n" #: net.rc:30 -#, fuzzy msgid "Stopping dependent service: %1\n" -msgstr "Stoppe den abbhängigen Dienst: %s\n" +msgstr "Stoppe den abbhängigen Dienst: %1\n" #: net.rc:31 -#, fuzzy msgid "Could not stop service %1\n" -msgstr "Konnte den Dienst nicht stoppen %s\n" +msgstr "Konnte den Dienst nicht stoppen %1\n" #: net.rc:32 msgid "Could not get handle to service control manager.\n" @@ -8704,34 +8689,28 @@ msgid "Could not get handle to service.\n" msgstr "Konnte den Zeiger zum Dienst nicht bekommen.\n" #: net.rc:34 -#, fuzzy msgid "The %1 service is starting.\n" -msgstr "Der %s Dienst startet.\n" +msgstr "Der %1 Dienst startet.\n" #: net.rc:35 -#, fuzzy msgid "The %1 service was started successfully.\n" -msgstr "Der %s Dienst wurde erfolgreich gestartet.\n" +msgstr "Der %1 Dienst wurde erfolgreich gestartet.\n" #: net.rc:36 -#, fuzzy msgid "The %1 service failed to start.\n" -msgstr "Der Start des %s Dienstes ist fehlgeschlagen.\n" +msgstr "Der Start des %1 Dienstes ist fehlgeschlagen.\n" #: net.rc:37 -#, fuzzy msgid "The %1 service is stopping.\n" -msgstr "Der %s Dienst wird gestoppt.\n" +msgstr "Der %1 Dienst wird gestoppt.\n" #: net.rc:38 -#, fuzzy msgid "The %1 service was stopped successfully.\n" -msgstr "Der %s Dienst wurde erfolgreich beendet.\n" +msgstr "Der %1 Dienst wurde erfolgreich beendet.\n" #: net.rc:39 -#, fuzzy msgid "The %1 service failed to stop.\n" -msgstr "Der %s Dienst konnte nicht beendet werden.\n" +msgstr "Der %1 Dienst konnte nicht beendet werden.\n" #: net.rc:41 msgid "There are no entries in the list.\n" @@ -8748,9 +8727,8 @@ msgstr "" "---------------------------------------------------------------\n" #: net.rc:43 -#, fuzzy msgid "%1 %2 %3 Open resources: %4!u!\n" -msgstr "%s %s %s Offene Ressourcen: %lu\n" +msgstr "%1 %2 %3 Offene Ressourcen: %4!u!\n" #: net.rc:44 notepad.rc:122 oleview.rc:159 oleview.rc:172 winefile.rc:131 #: winefile.rc:154 winefile.rc:184 winemine.rc:68 winemine.rc:78 @@ -9090,13 +9068,8 @@ msgid "&Toolbar" msgstr "&Symbolleiste" #: oleview.rc:65 oleview.rc:87 winefile.rc:68 -#, fuzzy msgid "&Status Bar" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"&Statusleiste\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"S&tatusleiste" +msgstr "S&tatusleiste" #: oleview.rc:67 regedit.rc:69 winefile.rc:82 msgid "&Refresh\tF5" @@ -10663,14 +10636,12 @@ msgid "(None)" msgstr "(Kein)" #: winecfg.rc:89 -#, fuzzy msgid "Audio test failed!" -msgstr "Festplattenreset fehlgeschlagen\n" +msgstr "Festplattenreset fehlgeschlagen!" #: winecfg.rc:91 -#, fuzzy msgid "(System default)" -msgstr "System Ordner" +msgstr "(System Ordner)" #: winecfg.rc:51 msgid "" @@ -10958,9 +10929,8 @@ msgid "Screen buffer size must be greater or equal to the window's one" msgstr "Die Bildschirmgröße muß größer oder gleich der des Fensters sein" #: wineconsole.rc:34 -#, fuzzy msgid "Each character is %1!u! pixels wide on %2!u! pixels high" -msgstr "Jeder Buchstabe ist %ld Pixel breit und %ld Pixel hoch" +msgstr "Jeder Buchstabe ist %1!u! Pixel breit und %2!u! Pixel hoch" #: wineconsole.rc:35 msgid "This is a test" @@ -11276,9 +11246,8 @@ msgid "Security" msgstr "Sicherheit" #: winefile.rc:120 -#, fuzzy msgid "%1 of %2 free" -msgstr "%s von %s frei" +msgstr "%1 von %2 frei" #: winemine.rc:34 msgid "&Game" @@ -11349,9 +11318,8 @@ msgid "Rows" msgstr "Reihen" #: winemine.rc:87 -#, fuzzy msgid "Columns" -msgstr "&Spalte" +msgstr "Spalten" #: winemine.rc:88 msgid "Mines" @@ -11813,59 +11781,50 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "Falsche Parameteranzahl - xcopy /? zeigt Hilfe an\n" #: xcopy.rc:28 -#, fuzzy msgid "Invalid parameter '%1' - Use xcopy /? for help\n" -msgstr "Unbekannter Parameter '%s' - xcopy /? zeigt Hilfe an\n" +msgstr "Unbekannter Parameter '%1' - xcopy /? zeigt die Hilfe an\n" #: xcopy.rc:29 msgid "Press <enter> to begin copying\n" msgstr "Eingabetaste betätigen, um mit dem Kopieren zu beginnen\n" #: xcopy.rc:30 -#, fuzzy msgid "%1!d! file(s) would be copied\n" -msgstr "%d Datei(en) würden kopiert\n" +msgstr "%1!d! Datei(en) würden kopiert werden\n" #: xcopy.rc:31 -#, fuzzy msgid "%1!d! file(s) copied\n" -msgstr "%d Datei(en) kopiert\n" +msgstr "%1!d! Datei(en) kopiert\n" #: xcopy.rc:34 -#, fuzzy msgid "" "Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" -"Ist '%s' eine Datei oder ein Verzeichnis\n" +"Ist '%1' eine Datei oder ein Verzeichnis\n" "am Zielsort?\n" "(D - Datei, V - Verzeichnis)\n" #: xcopy.rc:35 -#, fuzzy msgid "%1? (Yes|No)\n" -msgstr "%s? (Ja|Nein)\n" +msgstr "%1? (Ja|Nein)\n" #: xcopy.rc:36 -#, fuzzy msgid "Overwrite %1? (Yes|No|All)\n" -msgstr "%s überschreiben? (Ja|Nein|Alle)\n" +msgstr "%1 überschreiben? (Ja|Nein|Alle)\n" #: xcopy.rc:37 -#, fuzzy msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" -msgstr "Kopieren von '%s' nach '%s' fehlgeschlagen. Fehlernummer: %d\n" +msgstr "Kopieren von '%1' nach '%2' fehlgeschlagen. Fehlernummer: %3!d!\n" #: xcopy.rc:38 -#, fuzzy msgid "Failed to open '%1'\n" -msgstr "'%s' konnte nicht geöffnet werden\n" +msgstr "'%1' konnte nicht geöffnet werden\n" #: xcopy.rc:39 -#, fuzzy msgid "Failed during reading of '%1'\n" -msgstr "Fehler beim Lesen von '%s'\n" +msgstr "Fehler beim Lesen von '%1'\n" #: xcopy.rc:43 msgctxt "File key"

1 0

Henri Verbeet : wined3d: Construct the projection matrix directly in set_blit_dimension().
by Alexandre Julliard 02 Nov '11

02 Nov '11

Module: wine Branch: master Commit: 1c91b082203bb62e7a28c63fd9befc391d29ad7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c91b082203bb62e7a28c63fd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 1 20:15:18 2011 +0100 wined3d: Construct the projection matrix directly in set_blit_dimension(). This saves a needless matrix multiplication and is actually more obvious than the glOrtho() call. --- dlls/wined3d/context.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 29d0b3f..31a604c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1666,13 +1666,20 @@ void context_destroy(struct wined3d_device *device, struct wined3d_context *cont } /* GL locking is done by the caller */ -static inline void set_blit_dimension(UINT width, UINT height) { +static void set_blit_dimension(UINT width, UINT height) +{ + const GLdouble projection[] = + { + 2.0 / width, 0.0, 0.0, 0.0, + 0.0, 2.0 / height, 0.0, 0.0, + 0.0, 0.0, 2.0, 0.0, + -1.0, -1.0, -1.0, 1.0, + }; + glMatrixMode(GL_PROJECTION); checkGLcall("glMatrixMode(GL_PROJECTION)"); - glLoadIdentity(); - checkGLcall("glLoadIdentity()"); - glOrtho(0, width, 0, height, 0.0, -1.0); - checkGLcall("glOrtho"); + glLoadMatrixd(projection); + checkGLcall("glLoadMatrixd"); glViewport(0, 0, width, height); checkGLcall("glViewport"); }

1 0

Henri Verbeet : wined3d: Construct the rhw projection matrix directly in transform_projection().
by Alexandre Julliard 02 Nov '11

02 Nov '11

Module: wine Branch: master Commit: 6e7f33a7f005a595afbbf45d7be6bcb861523478 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e7f33a7f005a595afbbf45d7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 1 20:15:19 2011 +0100 wined3d: Construct the rhw projection matrix directly in transform_projection(). --- dlls/wined3d/state.c | 77 ++++++++++++++++++++----------------------------- 1 files changed, 32 insertions(+), 45 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8cf02ef..21797d5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3888,56 +3888,48 @@ static void transform_projection(struct wined3d_context *context, const struct w { glMatrixMode(GL_PROJECTION); checkGLcall("glMatrixMode(GL_PROJECTION)"); - glLoadIdentity(); - checkGLcall("glLoadIdentity"); + + /* There are a couple of additional things we have to take into account + * here besides the projection transformation itself: + * - We need to flip along the y-axis in case of offscreen rendering. + * - OpenGL Z range is {-Wc,...,Wc} while D3D Z range is {0,...,Wc}. + * - D3D coordinates refer to pixel centers while GL coordinates refer + * to pixel corners. + * - D3D has a top-left filling convention. We need to maintain this + * even after the y-flip mentioned above. + * In order to handle the last two points, we translate by + * (63.0 / 128.0) / VPw and (63.0 / 128.0) / VPh. This is equivalent to + * translating slightly less than half a pixel. We want the difference to + * be large enough that it doesn't get lost due to rounding inside the + * driver, but small enough to prevent it from interfering with any + * anti-aliasing. */ if (context->last_was_rhw) { + /* Transform D3D RHW coordinates to OpenGL clip coordinates. */ double x = state->viewport.X; double y = state->viewport.Y; double w = state->viewport.Width; double h = state->viewport.Height; - - TRACE("Calling glOrtho with x %.8e, y %.8e, w %.8e, h %.8e.\n", x, y, w, h); - if (context->render_offscreen) - glOrtho(x, x + w, -y, -y - h, 0.0, -1.0); - else - glOrtho(x, x + w, y + h, y, 0.0, -1.0); - checkGLcall("glOrtho"); - - /* D3D texture coordinates are flipped compared to OpenGL ones, so - * render everything upside down when rendering offscreen. */ - if (context->render_offscreen) + double x_scale = 2.0 / w; + double x_offset = ((63.0 / 64.0) - (2.0 * x) - w) / w; + double y_scale = context->render_offscreen ? 2.0 / h : 2.0 / -h; + double y_offset = context->render_offscreen + ? ((63.0 / 64.0) - (2.0 * y) - h) / h + : ((63.0 / 64.0) - (2.0 * y) - h) / -h; + const GLdouble projection[] = { - glScalef(1.0f, -1.0f, 1.0f); - checkGLcall("glScalef"); - } + x_scale, 0.0, 0.0, 0.0, + 0.0, y_scale, 0.0, 0.0, + 0.0, 0.0, 2.0, 0.0, + x_offset, y_offset, -1.0, 1.0, + }; - /* Window Coord 0 is the middle of the first pixel, so translate by 1/2 pixels */ - glTranslatef(63.0f / 128.0f, 63.0f / 128.0f, 0.0f); - checkGLcall("glTranslatef(63.0f / 128.0f, 63.0f / 128.0f, 0.0f)"); + glLoadMatrixd(projection); + checkGLcall("glLoadMatrixd"); } else { - /* The rule is that the window coordinate 0 does not correspond to the - beginning of the first pixel, but the center of the first pixel. - As a consequence if you want to correctly draw one line exactly from - the left to the right end of the viewport (with all matrices set to - be identity), the x coords of both ends of the line would be not - -1 and 1 respectively but (-1-1/viewport_widh) and (1-1/viewport_width) - instead. - - 1.0 / Width is used because the coord range goes from -1.0 to 1.0, then we - divide by the Width/Height, so we need the half range(1.0) to translate by - half a pixel. - - The other fun is that d3d's output z range after the transformation is [0;1], - but opengl's is [-1;1]. Since the z buffer is in range [0;1] for both, gl - scales [-1;1] to [0;1]. This would mean that we end up in [0.5;1] and loose a lot - of Z buffer precision and the clear values do not match in the z test. Thus scale - [0;1] to [-1;1], so when gl undoes that we utilize the full z range - */ - /* * Careful with the order of operations here, we're essentially working backwards: * x = x + 1/w; @@ -3955,18 +3947,13 @@ static void transform_projection(struct wined3d_context *context, const struct w * glTranslatef(1/w, -flip/h, -1.0) * glScalef(1.0, flip, 2.0); */ - - /* Translate by slightly less than a half pixel to force a top-left - * filling convention. We want the difference to be large enough that - * it doesn't get lost due to rounding inside the driver, but small - * enough to prevent it from interfering with any anti-aliasing. */ GLfloat xoffset = (63.0f / 64.0f) / state->viewport.Width; GLfloat yoffset = -(63.0f / 64.0f) / state->viewport.Height; + glLoadIdentity(); + checkGLcall("glLoadIdentity"); if (context->render_offscreen) { - /* D3D texture coordinates are flipped compared to OpenGL ones, so - * render everything upside down when rendering offscreen. */ glTranslatef(xoffset, -yoffset, -1.0f); checkGLcall("glTranslatef(xoffset, -yoffset, -1.0f)"); glScalef(1.0f, -1.0f, 2.0f);

1 0