March 2012 - Wine-commits - list.winehq.org

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

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

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

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

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

Alexandre Julliard : kernel32: Implement the memory resource notification functions.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: aeaf18077e42b23ff96cbd1192cb47948c767708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeaf18077e42b23ff96cbd119… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 12 10:33:32 2012 +0100 kernel32: Implement the memory resource notification functions. --- dlls/kernel32/sync.c | 60 +++++++++++++++++++++++++++++++++++++------ dlls/kernel32/tests/sync.c | 39 ++++++++++++++++++++++++++++ include/winbase.h | 1 + 3 files changed, 91 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index acbfab0..08ea8cc 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -2179,21 +2179,63 @@ BOOL WINAPI BindIoCompletionCallback( HANDLE FileHandle, LPOVERLAPPED_COMPLETION /*********************************************************************** * CreateMemoryResourceNotification (KERNEL32.@) */ -HANDLE WINAPI CreateMemoryResourceNotification(MEMORY_RESOURCE_NOTIFICATION_TYPE nt) -{ - FIXME("(%d) stub\n", nt); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return NULL; +HANDLE WINAPI CreateMemoryResourceNotification(MEMORY_RESOURCE_NOTIFICATION_TYPE type) +{ + static const WCHAR lowmemW[] = + {'\\','K','e','r','n','e','l','O','b','j','e','c','t','s', + '\\','L','o','w','M','e','m','o','r','y','C','o','n','d','i','t','i','o','n',0}; + static const WCHAR highmemW[] = + {'\\','K','e','r','n','e','l','O','b','j','e','c','t','s', + '\\','H','i','g','h','M','e','m','o','r','y','C','o','n','d','i','t','i','o','n',0}; + HANDLE ret; + UNICODE_STRING nameW; + OBJECT_ATTRIBUTES attr; + NTSTATUS status; + + switch (type) + { + case LowMemoryResourceNotification: + RtlInitUnicodeString( &nameW, lowmemW ); + break; + case HighMemoryResourceNotification: + RtlInitUnicodeString( &nameW, highmemW ); + break; + default: + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + status = NtOpenEvent( &ret, EVENT_ALL_ACCESS, &attr ); + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(status) ); + return 0; + } + return ret; } /*********************************************************************** * QueryMemoryResourceNotification (KERNEL32.@) */ -BOOL WINAPI QueryMemoryResourceNotification(HANDLE rnh, PBOOL rs) +BOOL WINAPI QueryMemoryResourceNotification(HANDLE handle, PBOOL state) { - FIXME("(%p, %p) stub\n", rnh, rs); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + switch (WaitForSingleObject( handle, 0 )) + { + case WAIT_OBJECT_0: + *state = TRUE; + return TRUE; + case WAIT_TIMEOUT: + *state = FALSE; + return TRUE; + } + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; } #ifdef __i386__ diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 07bc2ca..3965458 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -35,6 +35,8 @@ static HANDLE (WINAPI *pCreateWaitableTimerA)(SECURITY_ATTRIBUTES*,BOOL,LPCSTR); static BOOL (WINAPI *pDeleteTimerQueueEx)(HANDLE, HANDLE); static BOOL (WINAPI *pDeleteTimerQueueTimer)(HANDLE, HANDLE, HANDLE); static HANDLE (WINAPI *pOpenWaitableTimerA)(DWORD,BOOL,LPCSTR); +static HANDLE (WINAPI *pCreateMemoryResourceNotification)(MEMORY_RESOURCE_NOTIFICATION_TYPE); +static BOOL (WINAPI *pQueryMemoryResourceNotification)(HANDLE, PBOOL); static void test_signalandwait(void) { @@ -300,6 +302,8 @@ static void test_event(void) SECURITY_ATTRIBUTES sa; SECURITY_DESCRIPTOR sd; ACL acl; + DWORD ret; + BOOL val; /* no sd */ handle = CreateEventA(NULL, FALSE, FALSE, __FILE__ ": Test Event"); @@ -360,6 +364,39 @@ static void test_event(void) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); CloseHandle( handle ); + + /* resource notifications are events too */ + + if (!pCreateMemoryResourceNotification || !pQueryMemoryResourceNotification) + { + trace( "memory resource notifications not supported\n" ); + return; + } + handle = pCreateMemoryResourceNotification( HighMemoryResourceNotification + 1 ); + ok( !handle, "CreateMemoryResourceNotification succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + ret = pQueryMemoryResourceNotification( handle, &val ); + ok( !ret, "QueryMemoryResourceNotification succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + handle = pCreateMemoryResourceNotification( LowMemoryResourceNotification ); + ok( handle != 0, "CreateMemoryResourceNotification failed err %u\n", GetLastError() ); + ret = WaitForSingleObject( handle, 10 ); + ok( ret == WAIT_OBJECT_0 || ret == WAIT_TIMEOUT, "WaitForSingleObject wrong ret %u\n", ret ); + + val = ~0; + ret = pQueryMemoryResourceNotification( handle, &val ); + ok( ret, "QueryMemoryResourceNotification failed err %u\n", GetLastError() ); + ok( val == FALSE || val == TRUE, "wrong value %u\n", val ); + ret = CloseHandle( handle ); + ok( ret, "CloseHandle failed err %u\n", GetLastError() ); + + handle = CreateEventA(NULL, FALSE, FALSE, __FILE__ ": Test Event"); + val = ~0; + ret = pQueryMemoryResourceNotification( handle, &val ); + ok( ret, "QueryMemoryResourceNotification failed err %u\n", GetLastError() ); + ok( val == FALSE || val == TRUE, "wrong value %u\n", val ); + CloseHandle( handle ); } static void test_semaphore(void) @@ -1074,6 +1111,8 @@ START_TEST(sync) pDeleteTimerQueueEx = (void*)GetProcAddress(hdll, "DeleteTimerQueueEx"); pDeleteTimerQueueTimer = (void*)GetProcAddress(hdll, "DeleteTimerQueueTimer"); pOpenWaitableTimerA = (void*)GetProcAddress(hdll, "OpenWaitableTimerA"); + pCreateMemoryResourceNotification = (void *)GetProcAddress(hdll, "CreateMemoryResourceNotification"); + pQueryMemoryResourceNotification = (void *)GetProcAddress(hdll, "QueryMemoryResourceNotification"); test_signalandwait(); test_mutex(); diff --git a/include/winbase.h b/include/winbase.h index 6ec9230..492c63b 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2021,6 +2021,7 @@ WINBASEAPI BOOL WINAPI QueryFullProcessImageNameA(HANDLE,DWORD,LPSTR,PDWO WINBASEAPI BOOL WINAPI QueryFullProcessImageNameW(HANDLE,DWORD,LPWSTR,PDWORD); #define QueryFullProcessImageName WINELIB_NAME_AW(QueryFullProcessImageName) WINBASEAPI BOOL WINAPI QueryInformationJobObject(HANDLE,JOBOBJECTINFOCLASS,LPVOID,DWORD,DWORD*); +WINBASEAPI BOOL WINAPI QueryMemoryResourceNotification(HANDLE,PBOOL); WINBASEAPI BOOL WINAPI QueryPerformanceCounter(LARGE_INTEGER*); WINBASEAPI BOOL WINAPI QueryPerformanceFrequency(LARGE_INTEGER*); WINBASEAPI DWORD WINAPI QueueUserAPC(PAPCFUNC,HANDLE,ULONG_PTR);

1 0

Alexandre Julliard : winex11: Never try to clip the cursor if we don' t have XInput2.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 7c7a509e22a54cd64c6ea0be80303dcaad6e01fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c7a509e22a54cd64c6ea0be8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 12 10:33:52 2012 +0100 winex11: Never try to clip the cursor if we don't have XInput2. --- dlls/winex11.drv/mouse.c | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 332b71d..3dc1196 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -369,7 +369,7 @@ static void disable_xinput2(void) * * Start a pointer grab on the clip window. */ -static BOOL grab_clipping_window( const RECT *clip, BOOL only_with_xinput ) +static BOOL grab_clipping_window( const RECT *clip ) { static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; struct x11drv_thread_data *data = x11drv_thread_data(); @@ -386,14 +386,7 @@ static BOOL grab_clipping_window( const RECT *clip, BOOL only_with_xinput ) /* enable XInput2 unless we are already clipping */ if (!data->clip_hwnd) enable_xinput2(); - /* don't clip to 1x1 rectangle if we don't have XInput */ - if (clip->right - clip->left == 1 && clip->bottom - clip->top == 1) only_with_xinput = TRUE; - /* don't clip to fullscreen rectangle either (with 1-pixel offset to catch the dinput case) */ - if (clip->left <= virtual_screen_rect.left + 1 || clip->right >= virtual_screen_rect.right - 1 || - clip->top <= virtual_screen_rect.top + 1 || clip->bottom >= virtual_screen_rect.bottom - 1) - only_with_xinput = TRUE; - - if (only_with_xinput && data->xi2_state != xi_enabled) + if (data->xi2_state != xi_enabled) { WARN( "XInput2 not supported, refusing to clip to %s\n", wine_dbgstr_rect(clip) ); DestroyWindow( msg_hwnd ); @@ -499,7 +492,7 @@ LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd ) GetClipCursor( &clip ); if (clip.left > virtual_screen_rect.left || clip.right < virtual_screen_rect.right || clip.top > virtual_screen_rect.top || clip.bottom < virtual_screen_rect.bottom) - return grab_clipping_window( &clip, FALSE ); + return grab_clipping_window( &clip ); } return 0; } @@ -534,7 +527,7 @@ BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) if (root_window != DefaultRootWindow( gdi_display )) return FALSE; } TRACE( "win %p clipping fullscreen\n", hwnd ); - return grab_clipping_window( &rect, TRUE ); + return grab_clipping_window( &rect ); } /*********************************************************************** @@ -1310,7 +1303,7 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) SendNotifyMessageW( foreground, WM_X11DRV_CLIP_CURSOR, 0, 0 ); return TRUE; } - else if (grab_clipping_window( clip, FALSE )) return TRUE; + else if (grab_clipping_window( clip )) return TRUE; } else /* if currently clipping, check if we should switch to fullscreen clipping */ {

1 0

Frédéric Delanoy : winecfg: Avoid unneeded ellipsis in combo box item.
by Alexandre Julliard 12 Mar '12

12 Mar '12

1 0

Alistair Leslie-Hughes : mscoree: Add CoEEShutDownCOM stub.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: e3ab993647001adbf3ed8be6a794ae58fc0e7a95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3ab993647001adbf3ed8be6a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Mar 3 16:32:47 2012 +1100 mscoree: Add CoEEShutDownCOM stub. --- dlls/mscoree/mscoree.spec | 2 +- dlls/mscoree/mscoree_main.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index b944c34..ad883c6 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -9,7 +9,7 @@ @ stub CloseCtrs @ stdcall CLRCreateInstance(ptr ptr ptr) @ stdcall ClrCreateManagedInstance(wstr ptr ptr) -@ stub CoEEShutDownCOM +@ stdcall CoEEShutDownCOM() @ stdcall CoInitializeCor(long) @ stub CoInitializeEE @ stub CoUninitializeCor diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index b6ae490..1aa120f 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -641,6 +641,11 @@ HRESULT WINAPI DllCanUnloadNow(VOID) return S_FALSE; } +void WINAPI CoEEShutDownCOM(void) +{ + FIXME("stub.\n"); +} + INT WINAPI ND_RU1( const void *ptr, INT offset ) { return *((const BYTE *)ptr + offset);

1 0

Owen Rudge : comctl32/monthcal: Check both min and max ranges in IsDateInValidRange.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 72f174192b9adc75d47a166f2b28bf28a7c08898 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72f174192b9adc75d47a166f2… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Mar 8 11:34:01 2012 +0000 comctl32/monthcal: Check both min and max ranges in IsDateInValidRange. --- dlls/comctl32/monthcal.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index e148a62..1c9572b 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -353,14 +353,17 @@ static BOOL MONTHCAL_IsDateInValidRange(const MONTHCAL_INFO *infoPtr, else if(MONTHCAL_CompareSystemTime(date, &min_allowed_date) == -1) { fix_st = &min_allowed_date; } - else if(infoPtr->rangeValid & GDTR_MAX) { - if((MONTHCAL_CompareSystemTime(date, &infoPtr->maxDate) == 1)) { - fix_st = &infoPtr->maxDate; + else { + if(infoPtr->rangeValid & GDTR_MAX) { + if((MONTHCAL_CompareSystemTime(date, &infoPtr->maxDate) == 1)) { + fix_st = &infoPtr->maxDate; + } } - } - else if(infoPtr->rangeValid & GDTR_MIN) { - if((MONTHCAL_CompareSystemTime(date, &infoPtr->minDate) == -1)) { - fix_st = &infoPtr->minDate; + + if(infoPtr->rangeValid & GDTR_MIN) { + if((MONTHCAL_CompareSystemTime(date, &infoPtr->minDate) == -1)) { + fix_st = &infoPtr->minDate; + } } }

1 0