November 2011 - Wine-Commits

André Hentschel : ntdll: Only load ARMv7 PE images when supported by CPU.
by Alexandre Julliard Nov. 2, 2011

Nov. 2, 2011

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

Andrew Talbot : rsaenh: Remove unneeded address-of operator from array name .
by Alexandre Julliard Nov. 2, 2011

Nov. 2, 2011

Module: wine Branch: master Commit: 7998cd46290fdc298d87bad1c56f7f7219a695d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7998cd46290fdc298d87bad1c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 1 22:51:38 2011 +0000 rsaenh: Remove unneeded address-of operator from array name. --- dlls/rsaenh/rsaenh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index fc04579..fe5ff3a 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -2546,7 +2546,7 @@ static BOOL crypt_export_plaintext_key(CRYPTKEY *pCryptKey, BYTE *pbData, pBlobHeader->aiKeyAlg = pCryptKey->aiAlgid; *pKeyLen = pCryptKey->dwKeyLen; - memcpy(pbKey, &pCryptKey->abKeyValue, pCryptKey->dwKeyLen); + memcpy(pbKey, pCryptKey->abKeyValue, pCryptKey->dwKeyLen); } *pdwDataLen = dwDataLen; return TRUE;

1 0

Henri Verbeet : wined3d: Construct the projection matrix directly in set_blit_dimension().
by Alexandre Julliard Nov. 2, 2011

Nov. 2, 2011

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

André Hentschel : po: Update German translation.
by Alexandre Julliard Nov. 2, 2011

Nov. 2, 2011

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

André Hentschel : dbghelp: Use ARMv7 for debugging.
by Alexandre Julliard Nov. 2, 2011

Nov. 2, 2011

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

Henri Verbeet : wined3d: Construct the non-rhw projection matrix directly in transform_projection() .
by Alexandre Julliard Nov. 2, 2011

Nov. 2, 2011

Module: wine Branch: master Commit: 27132a30f58e691526447caca94faeafb62396fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=27132a30f58e691526447caca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 1 20:15:20 2011 +0100 wined3d: Construct the non-rhw projection matrix directly in transform_projection(). --- dlls/wined3d/state.c | 46 ++++++++++++++-------------------------------- 1 files changed, 14 insertions(+), 32 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 21797d5..cd03647 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3930,39 +3930,21 @@ static void transform_projection(struct wined3d_context *context, const struct w } else { - /* - * Careful with the order of operations here, we're essentially working backwards: - * x = x + 1/w; - * y = (y - 1/h) * flip; - * z = z * 2 - 1; - * - * Becomes: - * glTranslatef(0.0, 0.0, -1.0); - * glScalef(1.0, 1.0, 2.0); - * - * glScalef(1.0, flip, 1.0); - * glTranslatef(1/w, -1/h, 0.0); - * - * This is equivalent to: - * glTranslatef(1/w, -flip/h, -1.0) - * glScalef(1.0, flip, 2.0); - */ - 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) + double y_scale = context->render_offscreen ? -1.0 : 1.0; + double x_offset = (63.0 / 64.0) / state->viewport.Width; + double y_offset = context->render_offscreen + ? (63.0 / 64.0) / state->viewport.Height + : -(63.0 / 64.0) / state->viewport.Height; + const GLdouble projection[] = { - glTranslatef(xoffset, -yoffset, -1.0f); - checkGLcall("glTranslatef(xoffset, -yoffset, -1.0f)"); - glScalef(1.0f, -1.0f, 2.0f); - } else { - glTranslatef(xoffset, yoffset, -1.0f); - checkGLcall("glTranslatef(xoffset, yoffset, -1.0f)"); - glScalef(1.0f, 1.0f, 2.0f); - } - checkGLcall("glScalef"); + 1.0, 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, + }; + + glLoadMatrixd(projection); + checkGLcall("glLoadMatrixd"); glMultMatrixf(&state->transforms[WINED3DTS_PROJECTION].u.m[0][0]); checkGLcall("glLoadMatrixf");

1 0

Nikolay Sivov : msxml3: Silence IDispatchJS query.
by Alexandre Julliard Nov. 2, 2011

Nov. 2, 2011

Module: wine Branch: master Commit: cf5a68e9bd7af8a596f0b4ec59bbf25d9b43a107 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf5a68e9bd7af8a596f0b4ec5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 1 23:52:32 2011 +0300 msxml3: Silence IDispatchJS query. --- dlls/msxml3/dispex.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 274f604..436c277 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -631,6 +631,8 @@ BOOL dispex_query_interface(DispatchEx *This, REFIID riid, void **ppv) { static const IID IID_UndocumentedScriptIface = {0x719c3050,0xf9d3,0x11cf,{0xa4,0x93,0x00,0x40,0x05,0x23,0xa8,0xa0}}; + static const IID IID_IDispatchJS = + {0x719c3050,0xf9d3,0x11cf,{0xa4,0x93,0x00,0x40,0x05,0x23,0xa8,0xa6}}; if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); @@ -638,6 +640,9 @@ BOOL dispex_query_interface(DispatchEx *This, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); *ppv = &This->IDispatchEx_iface; + }else if(IsEqualGUID(&IID_IDispatchJS, riid)) { + TRACE("(%p)->(IID_IDispatchJS %p) returning NULL\n", This, ppv); + *ppv = NULL; }else if(IsEqualGUID(&IID_UndocumentedScriptIface, riid)) { TRACE("(%p)->(IID_UndocumentedScriptIface %p) returning NULL\n", This, ppv); *ppv = NULL;

1 0

Henri Verbeet : wined3d: Construct the rhw projection matrix directly in transform_projection().
by Alexandre Julliard Nov. 2, 2011

Nov. 2, 2011

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

André Hentschel : winedbg: Use ARMv7 for debugging.
by Alexandre Julliard Nov. 2, 2011

Nov. 2, 2011

Module: wine Branch: master Commit: 72270006daa3a95e3ab76d503576c354ce524c7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=72270006daa3a95e3ab76d503… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 1 16:41:33 2011 +0100 winedbg: Use ARMv7 for debugging. --- programs/winedbg/be_arm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index f71514c..0bd5601 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -243,7 +243,7 @@ static int be_arm_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, struct backend_cpu be_arm = { - IMAGE_FILE_MACHINE_ARM, + IMAGE_FILE_MACHINE_ARMV7, 4, be_cpu_linearize, be_cpu_build_addr,

1 0

Alexandre Julliard : gdi32/tests: Add some tests for palette-relative pattern brushes.
by Alexandre Julliard Nov. 2, 2011

Nov. 2, 2011

Module: wine Branch: master Commit: 8afcff3c79b0dd37c9d24075b2d93b81d21c4a38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8afcff3c79b0dd37c9d24075b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 2 11:33:00 2011 +0100 gdi32/tests: Add some tests for palette-relative pattern brushes. --- dlls/gdi32/tests/brush.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 77 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c index a2767ff..3742608 100644 --- a/dlls/gdi32/tests/brush.c +++ b/dlls/gdi32/tests/brush.c @@ -213,8 +213,85 @@ static void test_pattern_brush(void) GlobalFree( mem ); } +static void test_palette_brush(void) +{ + char buffer[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD) + 16 * 16]; + BITMAPINFO *info = (BITMAPINFO *)buffer; + WORD *indices = (WORD *)info->bmiColors; + char pal_buffer[sizeof(LOGPALETTE) + 256 * sizeof(PALETTEENTRY)]; + LOGPALETTE *pal = (LOGPALETTE *)pal_buffer; + HDC hdc = CreateCompatibleDC( 0 ); + DWORD *dib_bits; + HBITMAP dib; + HBRUSH brush; + int i; + HPALETTE palette, palette2; + + memset( info, 0, sizeof(*info) ); + info->bmiHeader.biSize = sizeof(info->bmiHeader); + info->bmiHeader.biWidth = 16; + info->bmiHeader.biHeight = 16; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = 32; + info->bmiHeader.biCompression = BI_RGB; + dib = CreateDIBSection( NULL, info, DIB_RGB_COLORS, (void**)&dib_bits, NULL, 0 ); + ok( dib != NULL, "CreateDIBSection failed\n" ); + + info->bmiHeader.biBitCount = 8; + for (i = 0; i < 256; i++) indices[i] = 255 - i; + for (i = 0; i < 256; i++) ((BYTE *)(indices + 256))[i] = i; + brush = CreateDIBPatternBrushPt( info, DIB_PAL_COLORS ); + ok( brush != NULL, "CreateDIBPatternBrushPt failed\n" ); + + pal->palVersion = 0x300; + pal->palNumEntries = 256; + for (i = 0; i < 256; i++) + { + pal->palPalEntry[i].peRed = i * 2; + pal->palPalEntry[i].peGreen = i * 2; + pal->palPalEntry[i].peBlue = i * 2; + pal->palPalEntry[i].peFlags = 0; + } + palette = CreatePalette( pal ); + + ok( SelectObject( hdc, dib ) != NULL, "SelectObject failed\n" ); + ok( SelectPalette( hdc, palette, 0 ) != NULL, "SelectPalette failed\n" ); + ok( SelectObject( hdc, brush ) != NULL, "SelectObject failed\n" ); + memset( dib_bits, 0xaa, 16 * 16 * 4 ); + PatBlt( hdc, 0, 0, 16, 16, PATCOPY ); + for (i = 0; i < 256; i++) + { + DWORD expect = (pal->palPalEntry[255 - i].peRed << 16 | + pal->palPalEntry[255 - i].peGreen << 8 | + pal->palPalEntry[255 - i].peBlue); + ok( dib_bits[i] == expect, "wrong bits %x/%x at %u,%u\n", dib_bits[i], expect, i % 16, i / 16 ); + } + + for (i = 0; i < 256; i++) pal->palPalEntry[i].peRed = i * 3; + palette2 = CreatePalette( pal ); + ok( SelectPalette( hdc, palette2, 0 ) != NULL, "SelectPalette failed\n" ); + memset( dib_bits, 0xaa, 16 * 16 * 4 ); + PatBlt( hdc, 0, 0, 16, 16, PATCOPY ); + for (i = 0; i < 256; i++) + { + DWORD expect = (pal->palPalEntry[255 - i].peRed << 16 | + pal->palPalEntry[255 - i].peGreen << 8 | + pal->palPalEntry[255 - i].peBlue); + if (expect) + todo_wine ok( dib_bits[i] == expect, "wrong bits %x/%x at %u,%u\n", dib_bits[i], expect, i % 16, i / 16 ); + else + ok( dib_bits[i] == expect, "wrong bits %x/%x at %u,%u\n", dib_bits[i], expect, i % 16, i / 16 ); + } + DeleteDC( hdc ); + DeleteObject( dib ); + DeleteObject( brush ); + DeleteObject( palette ); + DeleteObject( palette2 ); +} + START_TEST(brush) { test_solidbrush(); test_pattern_brush(); + test_palette_brush(); }

1 0