wine-commits March 2012

wine-commits@winehq.org

3 participants
710 discussions

Petr Kočandrle : po: Update Czech translation.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: bbb1bc3eeee7b6ddb7e7f3108d8d6c2c06604691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbb1bc3eeee7b6ddb7e7f3108… Author: Petr Kočandrle <petr.kocandrle(a)gmail.com> Date: Tue Mar 6 23:13:25 2012 +0100 po: Update Czech translation. --- po/cs.po | 418 +++++++++++++++++++++++++------------------------------------- 1 files changed, 168 insertions(+), 250 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bbb1bc3eeee7b6ddb7e7f…

1 0

Eduardo García : po: Update Spanish translation.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: eac87b969a24f1641ad65297cbebacb85af65122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eac87b969a24f1641ad65297c… Author: Eduardo García <eduardo.garcia(a)gmx.com> Date: Mon Mar 12 11:07:36 2012 +0100 po: Update Spanish translation. --- po/es.po | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/po/es.po b/po/es.po index b222770..73367bd 100644 --- a/po/es.po +++ b/po/es.po @@ -2766,7 +2766,7 @@ msgstr "" "Los certificados emitidos por estas autoridades certificadoras raíz, o " "cualquier autoridad certificadora emitida por estas ya no serán de " "confianza.\n" -"Está seguro de que quiere eliminiar estos certificados raíz de confianza?" +"Está seguro de que quiere eliminar estos certificados raíz de confianza?" #: cryptui.rc:115 msgid "" @@ -8510,8 +8510,8 @@ msgid "" "The output string was too large to fit in the return buffer. Increase the " "size of the buffer." msgstr "" -"La cadena de salida es muy grande para caber en el buffer de retorno. " -"Aumente el tamaño del búfer." +"La cadena de salida es muy grande para caber en el búfer de retorno. Aumente " +"el tamaño del búfer." #: winmm.rc:66 msgid "" @@ -13245,10 +13245,10 @@ msgid "" "button, then <a href=\"http://wiki.winehq.org/Bugs\">file a bug report</a> " "and attach that file to the report." msgstr "" -"Si este problema no esta presente en Windows y no ha sido reportado todavía, " +"Si este problema no esta presente en Windows y no ha sido informado todavía, " "puedes salvar la información detallada usando el botón \"Salvar Como\", " "entonces podrás <a href=\"http://wiki.winehq.org/Bugs\">informar de un " -"error</a> y adjuntar ese archivo al reporte de fallo." +"error</a> y adjuntar ese archivo al informe de fallo." #: winedbg.rc:35 msgid "Wine program crash" @@ -14145,8 +14145,8 @@ msgstr "" "\n" "[/I] Asumir directorio si el destino no existe y se copian dos o más\n" "\tarchivos.\n" -"[/S] Copia directorios and subdirectorios.\n" -"[/E] Copia directorios and subdirectorios, incluyendo los vacíos.\n" +"[/S] Copia directorios y subdirectorios.\n" +"[/E] Copia directorios y subdirectorios, incluyendo los vacíos.\n" "[/Q] No muestra la lista de nombres mientras copia, ej: silencioso.\n" "[/F] Muestrea la ruta completa de origen y destino mientras copia.\n" "[/L] Simular la operación, mostrando los nombres que serán copiados.\n"

1 0

Keith Bowes : po: Update Esperanto Translation.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: ebc1e6dac20fa9245f1b082b905413d0db2484fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebc1e6dac20fa9245f1b082b9… Author: Keith Bowes <zooplah(a)gmail.com> Date: Thu Mar 8 13:07:11 2012 -0500 po: Update Esperanto Translation. --- po/eo.po | 2339 ++++++++++++++++++++++++-------------------------------------- 1 files changed, 909 insertions(+), 1430 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ebc1e6dac20fa9245f1b0…

1 0

Igor Paliychuk : po: Update Ukrainian translation.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 3be893633fd4e0d46a7251f1443720159d17155f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3be893633fd4e0d46a7251f14… Author: Igor Paliychuk <mansonigor(a)gmail.com> Date: Fri Mar 9 00:06:36 2012 +0200 po: Update Ukrainian translation. --- po/uk.po | 890 +++++++++++++++++++++++++++----------------------------------- 1 files changed, 386 insertions(+), 504 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3be893633fd4e0d46a725…

1 0

Hasan Kiran : po: Update Turkish translation.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: c99b99f18163133772562e5e56310e83872628b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c99b99f18163133772562e5e5… Author: Hasan Kiran <sunder67(a)hotmail.com> Date: Thu Mar 8 21:30:03 2012 +0000 po: Update Turkish translation. --- po/tr.po | 106 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 53 insertions(+), 53 deletions(-) diff --git a/po/tr.po b/po/tr.po index 97bb355..46ab65c 100644 --- a/po/tr.po +++ b/po/tr.po @@ -6,9 +6,9 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-03-03 01:29+0200\n" +"PO-Revision-Date: 2012-03-08 23:20+0200\n" "Last-Translator: zeugma\n" -"Language-Team: none\n" +"Language-Team: Turkish <kde-i18n-doc(a)kde.org>\n" "Language: Turkish\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -88,11 +88,11 @@ msgstr "Bağlantı:" #: appwiz.rc:80 msgid "Support Information:" -msgstr "" +msgstr "Destek Bilgileri:" #: appwiz.rc:81 msgid "Support Telephone:" -msgstr "" +msgstr "Destek Telefon:" #: appwiz.rc:82 msgid "Readme:" @@ -509,7 +509,7 @@ msgstr "Yazı Tipi St&ili:" #: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:280 msgid "&Size:" -msgstr "Boyut:" +msgstr "&Boyut:" #: comdlg32.rc:260 msgid "Effects" @@ -525,7 +525,7 @@ msgstr "&Altı Çizili" #: comdlg32.rc:263 winecfg.rc:278 msgid "&Color:" -msgstr "Renk:" +msgstr "&Renk:" #: comdlg32.rc:266 msgid "Sample" @@ -1080,7 +1080,7 @@ msgstr "" #: comdlg32.rc:98 msgid "No toner; " -msgstr "" +msgstr "Toner yok; " #: comdlg32.rc:99 msgid "Page punt; " @@ -1145,7 +1145,7 @@ msgstr "%s Bağlan" #: credui.rc:28 msgid "Connecting to %s" -msgstr "" +msgstr "%s bağlanıyor" #: credui.rc:29 msgid "Logon unsuccessful" @@ -1356,11 +1356,11 @@ msgstr "" #: crypt32.rc:73 msgid "State or Province" -msgstr "" +msgstr "Eyalet veya Vilayet" #: crypt32.rc:74 msgid "Title" -msgstr "" +msgstr "Başlık" #: crypt32.rc:75 msgid "Given Name" @@ -1372,7 +1372,7 @@ msgstr "" #: crypt32.rc:77 msgid "Surname" -msgstr "" +msgstr "Soyisim" #: crypt32.rc:78 msgid "Domain Component" @@ -1380,7 +1380,7 @@ msgstr "" #: crypt32.rc:79 msgid "Street Address" -msgstr "" +msgstr "Sokak Adresi" #: crypt32.rc:80 msgid "Serial Number" @@ -1452,7 +1452,7 @@ msgstr "" #: crypt32.rc:97 msgid "Application Policies" -msgstr "" +msgstr "Uygulama Politikaları" #: crypt32.rc:98 msgid "Application Policy Mappings" @@ -1652,11 +1652,11 @@ msgstr "" #: crypt32.rc:147 cryptui.rc:131 msgid "Windows System Component Verification" -msgstr "" +msgstr "Windows Sistem Bileşeni Doğrulama" #: crypt32.rc:148 cryptui.rc:132 msgid "OEM Windows System Component Verification" -msgstr "" +msgstr "OEM Windows Sistem Bileşen Doğrulama" #: crypt32.rc:149 cryptui.rc:133 msgid "Embedded Windows System Component Verification" @@ -1728,7 +1728,7 @@ msgstr "" #: crypt32.rc:170 msgid "Personal" -msgstr "" +msgstr "Kişisel" #: crypt32.rc:171 msgid "Intermediate Certification Authorities" @@ -1895,7 +1895,7 @@ msgstr "" #: crypt32.rc:215 msgid "Financial Information=" -msgstr "" +msgstr "Finansal Bilgiler=" #: crypt32.rc:216 taskmgr.rc:397 msgid "Available" @@ -1919,7 +1919,7 @@ msgstr "Hayır" #: crypt32.rc:221 msgid "Digital Signature" -msgstr "" +msgstr "Dijital İmza" #: crypt32.rc:222 msgid "Non-Repudiation" @@ -1967,11 +1967,11 @@ msgstr "" #: crypt32.rc:233 msgid "S/MIME" -msgstr "" +msgstr "S/MIME" #: crypt32.rc:234 msgid "Signature" -msgstr "" +msgstr "İmza" #: crypt32.rc:235 msgid "SSL CA" @@ -1987,7 +1987,7 @@ msgstr "" #: cryptdlg.rc:27 msgid "Certificate Policy" -msgstr "" +msgstr "Sertifika İlkeleri" #: cryptdlg.rc:28 msgid "Policy Identifier: " @@ -2124,7 +2124,7 @@ msgstr "" #: cryptui.rc:280 msgid "Welcome to the Certificate Import Wizard" -msgstr "" +msgstr "Sertifika Alma Sihirbazına Hoş Geldiniz" #: cryptui.rc:283 msgid "" @@ -2145,7 +2145,7 @@ msgstr "&Dosya adı:" #: cryptui.rc:293 cryptui.rc:315 cryptui.rc:429 winecfg.rc:295 msgid "B&rowse..." -msgstr "Gözat..." +msgstr "&Gözat..." #: cryptui.rc:294 msgid "" @@ -2280,7 +2280,7 @@ msgstr "" #: cryptui.rc:396 msgid "&Confirm password:" -msgstr "" +msgstr "&Parola onayla:" #: cryptui.rc:404 msgid "Select the format you want to use:" @@ -2512,7 +2512,7 @@ msgstr "" #: cryptui.rc:74 msgid "X.509 Certificate (*.cer; *.crt)" -msgstr "" +msgstr "X.509 Sertifika (*.cer; *.crt)" #: cryptui.rc:75 msgid "Personal Information Exchange (*.pfx; *.p12)" @@ -2544,7 +2544,7 @@ msgstr "" #: cryptui.rc:83 msgid "Could not open " -msgstr "" +msgstr "Açılamadı " #: cryptui.rc:84 msgid "Determined by the program" @@ -2812,7 +2812,7 @@ msgstr "" #: cryptui.rc:171 msgid "The passwords do not match." -msgstr "" +msgstr "Parolalar eşleşmedi." #: cryptui.rc:172 msgid "Note: The private key for this certificate could not be opened." @@ -2976,11 +2976,11 @@ msgstr "Çıkış" #: gphoto2.rc:40 msgid "Transferring" -msgstr "" +msgstr "Aktarılıyor" #: gphoto2.rc:43 msgid "Transferring... Please Wait" -msgstr "" +msgstr "Aktarılıyor...Lütfen Bekleyin" #: gphoto2.rc:48 msgid "Connecting to camera" @@ -2988,7 +2988,7 @@ msgstr "" #: gphoto2.rc:52 msgid "Connecting to camera... Please Wait" -msgstr "" +msgstr "Kameraya bağlanılıyor...Lütfen Bekleyin" #: hhctrl.rc:56 msgid "S&ync" @@ -3214,7 +3214,7 @@ msgstr "" #: inetcpl.rc:56 msgid "Delete &files..." -msgstr "" +msgstr "&Dosyaları sil..." #: inetcpl.rc:57 msgid "&Settings..." @@ -3660,7 +3660,7 @@ msgstr "Ağ adı silindi.\n" #: winerror.mc:291 msgid "Network access denied.\n" -msgstr "" +msgstr "Ağ erişimi engellendi.\n" #: winerror.mc:296 msgid "Bad device type.\n" @@ -3784,7 +3784,7 @@ msgstr "" #: winerror.mc:451 msgid "Invalid IOCTL.\n" -msgstr "" +msgstr "IOCTL geçersiz.\n" #: winerror.mc:456 msgid "Invalid verify switch.\n" @@ -4809,7 +4809,7 @@ msgstr "" #: winerror.mc:1741 msgid "No network.\n" -msgstr "" +msgstr "Ağ yok.\n" #: winerror.mc:1746 msgid "Operation canceled by user.\n" @@ -5877,7 +5877,7 @@ msgstr "" #: winerror.mc:3086 msgid "Invalid tag.\n" -msgstr "" +msgstr "Geçersiz etiket.\n" #: winerror.mc:3091 msgid "Invalid array bounds.\n" @@ -5885,7 +5885,7 @@ msgstr "" #: winerror.mc:3096 msgid "No entry name.\n" -msgstr "" +msgstr "İsim girilmedi.\n" #: winerror.mc:3101 msgid "Invalid name syntax.\n" @@ -5897,7 +5897,7 @@ msgstr "" #: winerror.mc:3111 msgid "No network address.\n" -msgstr "" +msgstr "Ağ adresi yok.\n" #: winerror.mc:3116 msgid "Duplicate endpoint.\n" @@ -5985,7 +5985,7 @@ msgstr "" #: winerror.mc:3221 msgid "Entry not found.\n" -msgstr "" +msgstr "Girdi bulunamadı.\n" #: winerror.mc:3226 msgid "Name service unavailable.\n" @@ -7093,7 +7093,7 @@ msgstr "" #: sane.rc:35 msgctxt "unit: percent" msgid "%" -msgstr "" +msgstr "%" #: sane.rc:36 msgctxt "unit: microseconds" @@ -7989,7 +7989,7 @@ msgstr "Bu iletiyi bir daha &gösterme" #: shlwapi.rc:27 msgid "%d bytes" -msgstr "" +msgstr "%d bayt" #: shlwapi.rc:28 msgctxt "time unit: hours" @@ -9025,7 +9025,7 @@ msgstr "Sa&yısal" #: clock.rc:32 notepad.rc:50 winecfg.rc:289 winefile.rc:60 wordpad.rc:81 msgid "&Font..." -msgstr "" +msgstr "&Yazıtipi" #: clock.rc:34 msgid "&Without Titlebar" @@ -11003,7 +11003,7 @@ msgstr "" #: regedit.rc:201 msgid "(Default)" -msgstr "" +msgstr "(Standart)" #: regedit.rc:202 msgid "(value not set)" @@ -11015,7 +11015,7 @@ msgstr "" #: regedit.rc:204 msgid "(unknown %d)" -msgstr "" +msgstr "(%d bilinmiyor)" #: regedit.rc:160 msgid "Quits the registry editor" @@ -11865,7 +11865,7 @@ msgstr "CPU Kullanımı: %3d%%" #: taskmgr.rc:266 msgid "Processes: %d" -msgstr "" +msgstr "Süreçler: %d" #: taskmgr.rc:267 msgid "Mem Usage: %1!u!kB / %2!u!kB" @@ -12250,27 +12250,27 @@ msgstr "" #: winecfg.rc:258 msgid "Defaults" -msgstr "" +msgstr "Varsayılanlar" #: winecfg.rc:259 msgid "Output device:" -msgstr "" +msgstr "Çıktı aygıtı:" #: winecfg.rc:260 msgid "Voice output device:" -msgstr "" +msgstr "Ses çıkış aygıtı:" #: winecfg.rc:261 msgid "Input device:" -msgstr "" +msgstr "Girdi aygıtı:" #: winecfg.rc:262 msgid "Voice input device:" -msgstr "" +msgstr "Ses giriş aygıtı:" #: winecfg.rc:267 msgid "&Test Sound" -msgstr "" +msgstr "&Ses Testi" #: winecfg.rc:274 msgid "Appearance" @@ -12286,7 +12286,7 @@ msgstr "Tema kur..." #: winecfg.rc:282 msgid "It&em:" -msgstr "Item:" +msgstr "&Öğe:" #: winecfg.rc:284 msgid "C&olor:" @@ -12370,11 +12370,11 @@ msgstr "(Hiçbiri)" #: winecfg.rc:83 msgid "Audio test failed!" -msgstr "" +msgstr "Ses testi başarısız!" #: winecfg.rc:85 msgid "(System default)" -msgstr "" +msgstr "(Varsayılan sistem)" #: winecfg.rc:51 msgid ""

1 0

André Hentschel : ntdll: Add support for dynamically generated stub entry points on ARM.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 33236819c839f6ac053d724e0930c95bb2e4eddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=33236819c839f6ac053d724e0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 8 22:12:30 2012 +0100 ntdll: Add support for dynamically generated stub entry points on ARM. --- dlls/ntdll/loader.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 42 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 381e2ac..5dc7911 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -177,7 +177,7 @@ static inline BOOL call_dll_entry_point( DLLENTRYPROC proc, void *module, #endif /* __i386__ */ -#if defined(__i386__) || defined(__x86_64__) +#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) /************************************************************************* * stub_entry_point * @@ -209,6 +209,19 @@ struct stub BYTE call; /* call stub_entry_point */ DWORD entry; }; +#elif defined(__arm__) +struct stub +{ + BYTE ldr_r0[4]; /* ldr r0, $dll */ + BYTE mov_pc_pc1[4]; /* mov pc,pc */ + const char *dll; + BYTE ldr_r1[4]; /* ldr r1, $name */ + BYTE mov_pc_pc2[4]; /* mov pc,pc */ + const char *name; + BYTE mov_r2_lr[4]; /* mov r2, lr */ + BYTE ldr_pc_pc[4]; /* ldr pc, [pc, #-4] */ + const void* entry; +}; #else struct stub { @@ -253,6 +266,34 @@ static ULONG_PTR allocate_stub( const char *dll, const char *name ) stub->dll = dll; stub->call = 0xe8; /* call stub_entry_point */ stub->entry = (BYTE *)stub_entry_point - (BYTE *)(&stub->entry + 1); +#elif defined(__arm__) + stub->ldr_r0[0] = 0x00; /* ldr r0, $dll */ + stub->ldr_r0[1] = 0x00; + stub->ldr_r0[2] = 0x9f; + stub->ldr_r0[3] = 0xe5; + stub->mov_pc_pc1[0] = 0x0f; /* mov pc,pc */ + stub->mov_pc_pc1[1] = 0xf0; + stub->mov_pc_pc1[2] = 0xa0; + stub->mov_pc_pc1[3] = 0xe1; + stub->dll = dll; + stub->ldr_r1[0] = 0x00; /* ldr r1, $name */ + stub->ldr_r1[1] = 0x10; + stub->ldr_r1[2] = 0x9f; + stub->ldr_r1[3] = 0xe5; + stub->mov_pc_pc2[0] = 0x0f; /* mov pc,pc */ + stub->mov_pc_pc2[1] = 0xf0; + stub->mov_pc_pc2[2] = 0xa0; + stub->mov_pc_pc2[3] = 0xe1; + stub->name = name; + stub->mov_r2_lr[0] = 0x0e; /* mov r2, lr */ + stub->mov_r2_lr[1] = 0x20; + stub->mov_r2_lr[2] = 0xa0; + stub->mov_r2_lr[3] = 0xe1; + stub->ldr_pc_pc[0] = 0x04; /* ldr pc, [pc, #-4] */ + stub->ldr_pc_pc[1] = 0xf0; + stub->ldr_pc_pc[2] = 0x1f; + stub->ldr_pc_pc[3] = 0xe5; + stub->entry = stub_entry_point; #else stub->movq_rdi[0] = 0x48; /* movq $dll,%rdi */ stub->movq_rdi[1] = 0xbf;

1 0

André Hentschel : kernel32: Forward RtlRaiseException to ntdll on ARM.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 58a50926eb6bca500d8022284b91dcb841117f12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58a50926eb6bca500d8022284… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 8 22:11:40 2012 +0100 kernel32: Forward RtlRaiseException to ntdll on ARM. --- dlls/kernel32/kernel32.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 1c794c9..e6baa38 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1024,6 +1024,7 @@ @ stdcall -arch=x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory @ stdcall -arch=x86_64,arm RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader +@ stdcall -arch=arm -register RtlRaiseException(ptr) ntdll.RtlRaiseException @ stdcall RtlUnwind(ptr ptr ptr long) ntdll.RtlUnwind @ stdcall -arch=x86_64 RtlUnwindEx(long long ptr long ptr) ntdll.RtlUnwindEx @ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) ntdll.RtlVirtualUnwind

1 0

André Hentschel : kernel32: Forward RtlPcToFileHeader to ntdll also on ARM.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: e303fd5ebe8435e3a586ac07b53991ef1b3e1bdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e303fd5ebe8435e3a586ac07b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 8 22:10:52 2012 +0100 kernel32: Forward RtlPcToFileHeader to ntdll also on ARM. --- dlls/kernel32/kernel32.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index fb3f9c2..1c794c9 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1023,7 +1023,7 @@ @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory @ stdcall -arch=x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory -@ stdcall -arch=x86_64 RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader +@ stdcall -arch=x86_64,arm RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader @ stdcall RtlUnwind(ptr ptr ptr long) ntdll.RtlUnwind @ stdcall -arch=x86_64 RtlUnwindEx(long long ptr long ptr) ntdll.RtlUnwindEx @ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) ntdll.RtlVirtualUnwind

1 0

Owen Rudge : comctl32/datetime: Fix AM/PM handling with 12-hour fields.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: ffbdd27268f1b5c4bb1d57f1014f1512e4fc6cd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffbdd27268f1b5c4bb1d57f10… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Mar 8 11:34:38 2012 +0000 comctl32/datetime: Fix AM/PM handling with 12-hour fields. --- dlls/comctl32/datetime.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index f65691e..bfd5d5e 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -4,6 +4,7 @@ * Copyright 1998, 1999 Eric Kohl * Copyright 1999, 2000 Alex Priem <alexp(a)sci.kun.nl> * Copyright 2000 Chris Morgan <cmorgan(a)wpi.edu> + * Copyright 2012 Owen Rudge for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -896,9 +897,20 @@ DATETIME_ApplySelectedField (DATETIME_INFO *infoPtr) break; case ONEDIGIT12HOUR: case TWODIGIT12HOUR: + if (val >= 24) + val -= 20; + + if (val >= 13) + date.wHour = val; + else if (val != 0) { + if (date.wHour >= 12) /* preserve current AM/PM state */ + date.wHour = (val == 12 ? 12 : val + 12); + else + date.wHour = (val == 12 ? 0 : val); + } + break; case ONEDIGIT24HOUR: case TWODIGIT24HOUR: - /* FIXME: Preserve AM/PM for 12HOUR? */ date.wHour = val; break; case ONEDIGITMINUTE: @@ -1232,6 +1244,16 @@ DATETIME_Char (DATETIME_INFO *infoPtr, WPARAM vkCode) else maxChars = 2; + if ((fieldSpec == ONEDIGIT12HOUR || + fieldSpec == TWODIGIT12HOUR || + fieldSpec == ONEDIGIT24HOUR || + fieldSpec == TWODIGIT24HOUR) && + (infoPtr->nCharsEntered == 1)) + { + if (vkCode >= '3') + maxChars = 1; + } + if (maxChars == infoPtr->nCharsEntered) DATETIME_ApplySelectedField(infoPtr); }

1 0

Owen Rudge : comctl32/datetime: Allow entering 'AM' or 'PM' via keyboard.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 74d1c11684b91cb88c663b016f423876ab8c028f URL: http://source.winehq.org/git/wine.git/?a=commit;h=74d1c11684b91cb88c663b016… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Mar 8 11:34:33 2012 +0000 comctl32/datetime: Allow entering 'AM' or 'PM' via keyboard. --- dlls/comctl32/datetime.c | 35 ++++++++++++++++++++++++++++------- 1 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index f29b2d2..f65691e 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -852,8 +852,13 @@ DATETIME_ApplySelectedField (DATETIME_INFO *infoPtr) if (infoPtr->select == -1 || infoPtr->nCharsEntered == 0) return; - for (i=0; i<infoPtr->nCharsEntered; i++) - val = val * 10 + infoPtr->charsEntered[i] - '0'; + if ((infoPtr->fieldspec[fieldNum] == ONELETTERAMPM) || + (infoPtr->fieldspec[fieldNum] == TWOLETTERAMPM)) + val = infoPtr->charsEntered[0]; + else { + for (i=0; i<infoPtr->nCharsEntered; i++) + val = val * 10 + infoPtr->charsEntered[i] - '0'; + } infoPtr->nCharsEntered = 0; @@ -904,6 +909,16 @@ DATETIME_ApplySelectedField (DATETIME_INFO *infoPtr) case TWODIGITSECOND: date.wSecond = val; break; + case ONELETTERAMPM: + case TWOLETTERAMPM: + if (val == 'a' || val == 'A') { + if (date.wHour >= 12) + date.wHour -= 12; + } else if (val == 'p' || val == 'P') { + if (date.wHour < 12) + date.wHour += 12; + } + break; } if (clamp_day && date.wDay > MONTHCAL_MonthLength(date.wMonth, date.wYear)) @@ -1197,16 +1212,21 @@ DATETIME_KeyDown (DATETIME_INFO *infoPtr, DWORD vkCode) static LRESULT DATETIME_Char (DATETIME_INFO *infoPtr, WPARAM vkCode) { - int fieldNum = infoPtr->select & DTHT_DATEFIELD; + int fieldNum, fieldSpec; - if (vkCode >= '0' && vkCode <= '9') { + fieldNum = infoPtr->select & DTHT_DATEFIELD; + fieldSpec = infoPtr->fieldspec[fieldNum]; + + if (fieldSpec == ONELETTERAMPM || fieldSpec == TWOLETTERAMPM) { + infoPtr->charsEntered[0] = vkCode; + infoPtr->nCharsEntered = 1; + + DATETIME_ApplySelectedField(infoPtr); + } else if (vkCode >= '0' && vkCode <= '9') { int maxChars; - int fieldSpec; infoPtr->charsEntered[infoPtr->nCharsEntered++] = vkCode; - fieldSpec = infoPtr->fieldspec[fieldNum]; - if (fieldSpec == INVALIDFULLYEAR || fieldSpec == FULLYEAR) maxChars = 4; else @@ -1215,6 +1235,7 @@ DATETIME_Char (DATETIME_INFO *infoPtr, WPARAM vkCode) if (maxChars == infoPtr->nCharsEntered) DATETIME_ApplySelectedField(infoPtr); } + return 0; }

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2012