July 2009 - Wine-commits - list.winehq.org

Maarten Lankhorst : winealsa.drv: Add support for indirect read/ write in directsound support.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: f27d88e16fe0292d3efa7dac8966a0b612e62e6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f27d88e16fe0292d3efa7dac8… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Jul 12 20:11:55 2009 +0200 winealsa.drv: Add support for indirect read/write in directsound support. Allows pulseaudio to use the idsdriver interface, making it almost as fast as using native pulseaudio calls for as far as directsound is concerned. Prevents the creation of separate winmm feeder threads. --- dlls/winealsa.drv/dsoutput.c | 159 ++++++++++++++++++++++++++++++++---------- 1 files changed, 123 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f27d88e16fe0292d3efa7…

1 0

Frédéric Delanoy : kernel32: Fix typos in English errors messages.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: c692edb7e774fed7dc795795d1e1a5059e3616f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c692edb7e774fed7dc795795d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jul 12 13:14:30 2009 +0200 kernel32: Fix typos in English errors messages. --- dlls/kernel32/nls/winerr_enu.mc | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/nls/winerr_enu.mc b/dlls/kernel32/nls/winerr_enu.mc index 8dd2088..0c3aee4 100644 --- a/dlls/kernel32/nls/winerr_enu.mc +++ b/dlls/kernel32/nls/winerr_enu.mc @@ -786,7 +786,7 @@ Auto data segment exceeds 64k MessageId=200 SymbolicName=ERROR_RING2SEG_MUST_BE_MOVABLE Language=ENU -Ring 2 segment must be moveable +Ring 2 segment must be movable . MessageId=201 SymbolicName=ERROR_RELOC_CHAIN_XEEDS_SEGLIM @@ -1356,7 +1356,7 @@ No media in drive MessageId=1113 SymbolicName=ERROR_NO_UNICODE_TRANSLATION Language=ENU -No unicode translation +No Unicode translation . MessageId=1114 SymbolicName=ERROR_DLL_INIT_FAILED @@ -1756,7 +1756,7 @@ Connection refused MessageId=1226 SymbolicName=ERROR_GRACEFUL_DISCONNECT Language=ENU -Conection gracefully closed +Connection gracefully closed . MessageId=1227 SymbolicName=ERROR_ADDRESS_ALREADY_ASSOCIATED @@ -2226,7 +2226,7 @@ Bad logon session state MessageId=1366 SymbolicName=ERROR_LOGON_SESSION_COLLISION Language=ENU -Logon sesion ID collision +Logon session ID collision . MessageId=1367 SymbolicName=ERROR_INVALID_LOGON_TYPE @@ -3256,17 +3256,17 @@ Address error MessageId=1769 SymbolicName=RPC_S_FP_DIV_ZERO Language=ENU -Floating divide-by-zero +Floating-point divide-by-zero . MessageId=1770 SymbolicName=RPC_S_FP_UNDERFLOW Language=ENU -Floating underflow +Floating-point underflow . MessageId=1771 SymbolicName=RPC_S_FP_OVERFLOW Language=ENU -Floating overlow +Floating-point overflow . MessageId=1772 SymbolicName=RPC_X_NO_MORE_ENTRIES

1 0

Frédéric Delanoy : kernel32: Convert German error msgs resources to UTF-8.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 06a1aebdb3140bd4a86077a5fd2a08f4d616a739 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06a1aebdb3140bd4a86077a5f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jul 12 14:07:18 2009 +0200 kernel32: Convert German error msgs resources to UTF-8. --- dlls/kernel32/nls/winerr_deu.mc | 530 +++++++++++++++++++------------------- 1 files changed, 265 insertions(+), 265 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=06a1aebdb3140bd4a8607…

1 0

Frédéric Delanoy : kernel32: Convert French resources to UTF-8.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 83d537f3f0df54b0a793fb15ffa85316047d3fb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83d537f3f0df54b0a793fb15f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 10 18:36:57 2009 +0200 kernel32: Convert French resources to UTF-8. --- dlls/kernel32/nls/winerr_fra.mc | 112 +++++++++++++++++++------------------- 1 files changed, 56 insertions(+), 56 deletions(-) diff --git a/dlls/kernel32/nls/winerr_fra.mc b/dlls/kernel32/nls/winerr_fra.mc index 164e9b1..842616e 100644 --- a/dlls/kernel32/nls/winerr_fra.mc +++ b/dlls/kernel32/nls/winerr_fra.mc @@ -17,12 +17,12 @@ ; LanguageNames=(FRA=0x0c:winerr) -CodePages=(FRA=1252:0) +CodePages=(FRA=65001:0) MessageId=0 SymbolicName=ERROR_SUCCESS Language=FRA -Succ�s +Succès . MessageId=1 SymbolicName=ERROR_INVALID_FUNCTION @@ -47,7 +47,7 @@ Trop de fichiers ouverts MessageId=5 SymbolicName=ERROR_ACCESS_DENIED Language=FRA -Acc�s refus� +Accès refusé . MessageId=6 SymbolicName=ERROR_INVALID_HANDLE @@ -57,12 +57,12 @@ Attache invalide MessageId=7 SymbolicName=ERROR_ARENA_TRASHED Language=FRA -M�moire invalid�e +Mémoire invalidée . MessageId=8 SymbolicName=ERROR_NOT_ENOUGH_MEMORY Language=FRA -Pas assez de m�moire +Pas assez de mémoire . MessageId=9 SymbolicName=ERROR_INVALID_BLOCK @@ -82,17 +82,17 @@ Format incorrect MessageId=12 SymbolicName=ERROR_INVALID_ACCESS Language=FRA -Acc�s invalide +Accès invalide . MessageId=13 SymbolicName=ERROR_INVALID_DATA Language=FRA -Donn�es invalides +Données invalides . MessageId=14 SymbolicName=ERROR_OUTOFMEMORY Language=FRA -M�moire insuffisante +Mémoire insuffisante . MessageId=15 SymbolicName=ERROR_INVALID_DRIVE @@ -102,12 +102,12 @@ Lecteur invalide MessageId=16 SymbolicName=ERROR_CURRENT_DIRECTORY Language=FRA -Impossible de supprimer le r�pertoire courant +Impossible de supprimer le répertoire courant . MessageId=17 SymbolicName=ERROR_NOT_SAME_DEVICE Language=FRA -P�riph�rique diff�rent +Périphérique différent . MessageId=18 SymbolicName=ERROR_NO_MORE_FILES @@ -117,17 +117,17 @@ Plus de fichiers MessageId=19 SymbolicName=ERROR_WRITE_PROTECT Language=FRA -Prot�g� contre l'�criture +Protégé contre l'écriture . MessageId=20 SymbolicName=ERROR_BAD_UNIT Language=FRA -Unit� incorrecte +Unité incorrecte . MessageId=21 SymbolicName=ERROR_NOT_READY Language=FRA -Non pr�t +Non prêt . MessageId=22 SymbolicName=ERROR_BAD_COMMAND @@ -167,7 +167,7 @@ Plus de papier MessageId=29 SymbolicName=ERROR_WRITE_FAULT Language=FRA -Erreur d'�criture +Erreur d'écriture . MessageId=30 SymbolicName=ERROR_READ_FAULT @@ -177,7 +177,7 @@ Erreur de lecture MessageId=31 SymbolicName=ERROR_GEN_FAILURE Language=FRA -Erreur g�n�rale +Erreur générale . MessageId=32 SymbolicName=ERROR_SHARING_VIOLATION @@ -197,7 +197,7 @@ Mauvais disque MessageId=36 SymbolicName=ERROR_SHARING_BUFFER_EXCEEDED Language=FRA -Tampon de partage d�pass� +Tampon de partage dépassé . MessageId=38 SymbolicName=ERROR_HANDLE_EOF @@ -212,32 +212,32 @@ Disque plein MessageId=50 SymbolicName=ERROR_NOT_SUPPORTED Language=FRA -Requ�te non support�e +Requête non supportée . MessageId=51 SymbolicName=ERROR_REM_NOT_LIST Language=FRA -La machine distante n'�coute pas +La machine distante n'écoute pas . MessageId=52 SymbolicName=ERROR_DUP_NAME Language=FRA -Nom r�seau dupliqu� +Nom réseau dupliqué . MessageId=53 SymbolicName=ERROR_BAD_NETPATH Language=FRA -Chemin r�seau incorrect +Chemin réseau incorrect . MessageId=54 SymbolicName=ERROR_NETWORK_BUSY Language=FRA -R�seau occup� +Réseau occupé . MessageId=55 SymbolicName=ERROR_DEV_NOT_EXIST Language=FRA -Le p�riph�rique n'existe pas +Le périphérique n'existe pas . MessageId=56 SymbolicName=ERROR_TOO_MANY_CMDS @@ -247,17 +247,17 @@ Trop de commandes MessageId=57 SymbolicName=ERROR_ADAP_HDW_ERR Language=FRA -Erreur mat�rielle de l'adaptateur +Erreur matérielle de l'adaptateur . MessageId=58 SymbolicName=ERROR_BAD_NET_RESP Language=FRA -R�ponse du r�seau incorrecte +Réponse du réseau incorrecte . MessageId=59 SymbolicName=ERROR_UNEXP_NET_ERR Language=FRA -Erreur r�seau inattendue +Erreur réseau inattendue . MessageId=60 SymbolicName=ERROR_BAD_REM_ADAP @@ -277,37 +277,37 @@ Pas d'espace de spool MessageId=63 SymbolicName=ERROR_PRINT_CANCELLED Language=FRA -Impression annul�e +Impression annulée . MessageId=64 SymbolicName=ERROR_NETNAME_DELETED Language=FRA -Nom r�seau supprim� +Nom réseau supprimé . MessageId=65 SymbolicName=ERROR_NETWORK_ACCESS_DENIED Language=FRA -Acc�s r�seau refus� +Accès réseau refusé . MessageId=66 SymbolicName=ERROR_BAD_DEV_TYPE Language=FRA -Type de p�riph�rique incorrect +Type de périphérique incorrect . MessageId=67 SymbolicName=ERROR_BAD_NET_NAME Language=FRA -Nom r�seau incorrect +Nom réseau incorrect . MessageId=68 SymbolicName=ERROR_TOO_MANY_NAMES Language=FRA -Trop de noms r�seau +Trop de noms réseau . MessageId=69 SymbolicName=ERROR_TOO_MANY_SESS Language=FRA -Trop de sessions r�seau +Trop de sessions réseau . MessageId=70 SymbolicName=ERROR_SHARING_PAUSED @@ -317,7 +317,7 @@ Partage en pause MessageId=71 SymbolicName=ERROR_REQ_NOT_ACCEP Language=FRA -Requ�te non accept�e +Requête non acceptée . MessageId=72 SymbolicName=ERROR_REDIR_PAUSED @@ -332,7 +332,7 @@ Le fichier existe MessageId=82 SymbolicName=ERROR_CANNOT_MAKE Language=FRA -Impossible de cr�er +Impossible de créer . MessageId=83 SymbolicName=ERROR_FAIL_I24 @@ -342,12 +342,12 @@ Erreur Int24 MessageId=84 SymbolicName=ERROR_OUT_OF_STRUCTURES Language=FRA -� cours de structures +À cours de structures . MessageId=85 SymbolicName=ERROR_ALREADY_ASSIGNED Language=FRA -D�j� assign� +Déjà assigné . MessageId=86 SymbolicName=ERROR_INVALID_PASSWORD @@ -357,12 +357,12 @@ Mot de passe non valide MessageId=87 SymbolicName=ERROR_INVALID_PARAMETER Language=FRA -Param�tre non valide +Paramètre non valide . MessageId=88 SymbolicName=ERROR_NET_WRITE_FAULT Language=FRA -Erreur d'�criture r�seau +Erreur d'écriture réseau . MessageId=89 SymbolicName=ERROR_NO_PROC_SLOTS @@ -372,22 +372,22 @@ Plus d'emplacement pour processus MessageId=100 SymbolicName=ERROR_TOO_MANY_SEMAPHORES Language=FRA -Trop de s�maphores +Trop de sémaphores . MessageId=101 SymbolicName=ERROR_EXCL_SEM_ALREADY_OWNED Language=FRA -S�maphore exclusif d�j� acquis +Sémaphore exclusif déjà acquis . MessageId=102 SymbolicName=ERROR_SEM_IS_SET Language=FRA -Le s�maphore est actif +Le sémaphore est actif . MessageId=103 SymbolicName=ERROR_TOO_MANY_SEM_REQUESTS Language=FRA -Trop de requ�tes de s�maphores +Trop de requêtes de sémaphores . MessageId=104 SymbolicName=ERROR_INVALID_AT_INTERRUPT_TIME @@ -397,22 +397,22 @@ Non valide au moment de l'interruption MessageId=105 SymbolicName=ERROR_SEM_OWNER_DIED Language=FRA -L'acqu�reur du s�maphore est mort +L'acquéreur du sémaphore est mort . MessageId=106 SymbolicName=ERROR_SEM_USER_LIMIT Language=FRA -Limite utilisateur pour le s�maphore +Limite utilisateur pour le sémaphore . MessageId=107 SymbolicName=ERROR_DISK_CHANGE Language=FRA -Ins�rez le disque pour le lecteur %1 +Insérez le disque pour le lecteur %1 . MessageId=108 SymbolicName=ERROR_DRIVE_LOCKED Language=FRA -Lecteur verrouill� +Lecteur verrouillé . MessageId=109 SymbolicName=ERROR_BROKEN_PIPE @@ -422,12 +422,12 @@ Tube interrompu MessageId=110 SymbolicName=ERROR_OPEN_FAILED Language=FRA -�chec lors de l'ouverture +Échec lors de l'ouverture . MessageId=111 SymbolicName=ERROR_BUFFER_OVERFLOW Language=FRA -D�passement de tampon +Dépassement de tampon . MessageId=112 SymbolicName=ERROR_DISK_FULL @@ -452,7 +452,7 @@ IOCTL non valide MessageId=118 SymbolicName=ERROR_INVALID_VERIFY_SWITCH Language=FRA -Bascule de v�rification non valide +Bascule de vérification non valide . MessageId=119 SymbolicName=ERROR_BAD_DRIVER_LEVEL @@ -462,12 +462,12 @@ Niveau de pilote incorrect MessageId=120 SymbolicName=ERROR_CALL_NOT_IMPLEMENTED Language=FRA -Appel non impl�ment� +Appel non implémenté . MessageId=121 SymbolicName=ERROR_SEM_TIMEOUT Language=FRA -D�passement du d�lai du s�maphore +Dépassement du délai du sémaphore . MessageId=122 SymbolicName=ERROR_INSUFFICIENT_BUFFER @@ -487,7 +487,7 @@ Niveau non valide MessageId=125 SymbolicName=ERROR_NO_VOLUME_LABEL Language=FRA -Pas d'�tiquette de volume +Pas d'étiquette de volume . MessageId=126 SymbolicName=ERROR_MOD_NOT_FOUND @@ -497,7 +497,7 @@ Module introuvable MessageId=127 SymbolicName=ERROR_PROC_NOT_FOUND Language=FRA -Proc�dure introuvable +Procédure introuvable . MessageId=128 SymbolicName=ERROR_WAIT_NO_CHILDREN @@ -572,7 +572,7 @@ Attempt to SUBST to a JOINed drive MessageId=142 SymbolicName=ERROR_BUSY_DRIVE Language=FRA -Le lecteur est occup� +Le lecteur est occupé . MessageId=143 SymbolicName=ERROR_SAME_DRIVE @@ -587,7 +587,7 @@ Not toplevel directory MessageId=145 SymbolicName=ERROR_DIR_NOT_EMPTY Language=FRA -Le r�pertoire n'est pas vide +Le répertoire n'est pas vide . MessageId=146 SymbolicName=ERROR_IS_SUBST_PATH @@ -3607,7 +3607,7 @@ Already awaiting printer handle MessageId=1905 SymbolicName=ERROR_PRINTER_DELETED Language=FRA -Imprimante supprim�e +Imprimante supprimée . MessageId=1906 SymbolicName=ERROR_INVALID_PRINTER_STATE

1 0

Vincent Povirk : windowscodecs: Don' t leak memory when BmpFrameDecode_CopyPalette fails.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: d15870edfdb4a26d321493d88c6eda858f1aff0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d15870edfdb4a26d321493d88… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 9 11:24:42 2009 -0500 windowscodecs: Don't leak memory when BmpFrameDecode_CopyPalette fails. --- dlls/windowscodecs/bmpdecode.c | 51 ++++++++++++++++++++------------------- 1 files changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index 80447cf..0064e9d 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -191,6 +191,10 @@ static HRESULT WINAPI BmpFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, { HRESULT hr; BmpFrameDecode *This = (BmpFrameDecode*)iface; + int count; + WICColor *wiccolors=NULL; + RGBTRIPLE *bgrcolors=NULL; + TRACE("(%p,%p)\n", iface, pIPalette); if (This->bih.bV5Size == sizeof(BITMAPCOREHEADER)) @@ -199,30 +203,30 @@ static HRESULT WINAPI BmpFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, if (bch->bcBitCount <= 8) { /* 2**n colors in BGR format after the header */ - int count = 1 << bch->bcBitCount; - WICColor *wiccolors; ULONG tablesize, bytesread; - RGBTRIPLE *bgrcolors; LARGE_INTEGER offset; int i; + count = 1 << bch->bcBitCount; wiccolors = HeapAlloc(GetProcessHeap(), 0, sizeof(WICColor) * count); tablesize = sizeof(RGBTRIPLE) * count; bgrcolors = HeapAlloc(GetProcessHeap(), 0, tablesize); if (!wiccolors || !bgrcolors) { - HeapFree(GetProcessHeap(), 0, wiccolors); - HeapFree(GetProcessHeap(), 0, bgrcolors); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto end; } offset.QuadPart = sizeof(BITMAPFILEHEADER)+sizeof(BITMAPCOREHEADER); hr = IStream_Seek(This->stream, offset, STREAM_SEEK_SET, NULL); - if (FAILED(hr)) return hr; + if (FAILED(hr)) goto end; hr = IStream_Read(This->stream, bgrcolors, tablesize, &bytesread); - if (FAILED(hr)) return hr; - if (bytesread != tablesize) return E_FAIL; + if (FAILED(hr)) goto end; + if (bytesread != tablesize) { + hr = E_FAIL; + goto end; + } for (i=0; i<count; i++) { @@ -231,12 +235,6 @@ static HRESULT WINAPI BmpFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, (bgrcolors[i].rgbtGreen<<8)| bgrcolors[i].rgbtBlue; } - - hr = IWICPalette_InitializeCustom(pIPalette, wiccolors, count); - - HeapFree(GetProcessHeap(), 0, wiccolors); - HeapFree(GetProcessHeap(), 0, bgrcolors); - return hr; } else { @@ -247,8 +245,6 @@ static HRESULT WINAPI BmpFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, { if (This->bih.bV5BitCount <= 8) { - int count; - WICColor *wiccolors; ULONG tablesize, bytesread; LARGE_INTEGER offset; int i; @@ -264,26 +260,31 @@ static HRESULT WINAPI BmpFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, offset.QuadPart = sizeof(BITMAPFILEHEADER) + This->bih.bV5Size; hr = IStream_Seek(This->stream, offset, STREAM_SEEK_SET, NULL); - if (FAILED(hr)) return hr; + if (FAILED(hr)) goto end; hr = IStream_Read(This->stream, wiccolors, tablesize, &bytesread); - if (FAILED(hr)) return hr; - if (bytesread != tablesize) return E_FAIL; + if (FAILED(hr)) goto end; + if (bytesread != tablesize) { + hr = E_FAIL; + goto end; + } /* convert from BGR to BGRA by setting alpha to 100% */ for (i=0; i<count; i++) wiccolors[i] |= 0xff000000; - - hr = IWICPalette_InitializeCustom(pIPalette, wiccolors, count); - - HeapFree(GetProcessHeap(), 0, wiccolors); - return hr; } else { return WINCODEC_ERR_PALETTEUNAVAILABLE; } } + + hr = IWICPalette_InitializeCustom(pIPalette, wiccolors, count); + +end: + HeapFree(GetProcessHeap(), 0, wiccolors); + HeapFree(GetProcessHeap(), 0, bgrcolors); + return hr; } static HRESULT WINAPI BmpFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface,

1 0

Dylan Smith : richedit: Add more tests for WM_SETTEXT RTF support.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: e7fd0b46b0fc4f5a7f7ab4e5bc944a29eef71d99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7fd0b46b0fc4f5a7f7ab4e5b… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Jul 10 23:54:01 2009 -0400 richedit: Add more tests for WM_SETTEXT RTF support. --- dlls/riched20/tests/editor.c | 54 ++++++++++++++++++++++++++++++----------- 1 files changed, 39 insertions(+), 15 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 0383d14..914f25b 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3282,10 +3282,15 @@ static void test_WM_SETTEXT(void) const char * TestItem7 = "TestSomeText\r\n\r\r\n\rTestSomeText"; const char * TestItem7_after = "TestSomeText\r\n \r\nTestSomeText"; + const char rtftextA[] = "{\\rtf sometext}"; + const char urtftextA[] = "{\\urtf sometext}"; + const WCHAR rtftextW[] = {'{','\\','r','t','f',' ','s','o','m','e','t','e','x','t','}',0}; + const WCHAR urtftextW[] = {'{','\\','u','r','t','f',' ','s','o','m','e','t','e','x','t','}',0}; + const WCHAR sometextW[] = {'s','o','m','e','t','e','x','t',0}; + char buf[1024] = {0}; + WCHAR bufW[1024] = {0}; LRESULT result; - EDITSTREAM es; - char * p; /* This test attempts to show that WM_SETTEXT on a riched20 control causes any solitary \r to be converted to \r\n on return. Properly paired @@ -3302,7 +3307,7 @@ static void test_WM_SETTEXT(void) result, lstrlen(buf)); \ result = strcmp(b, buf); \ ok(result == 0, \ - "WM_SETTEXT round trip: strcmp = %ld\n", result); + "WM_SETTEXT round trip: strcmp = %ld, text=\"%s\"\n", result, buf); TEST_SETTEXT(TestItem1, TestItem1) TEST_SETTEXT(TestItem2, TestItem2_after) @@ -3313,20 +3318,39 @@ static void test_WM_SETTEXT(void) TEST_SETTEXT(TestItem6, TestItem6_after) TEST_SETTEXT(TestItem7, TestItem7_after) - /* The following test demonstrates that WM_SETTEXT supports RTF strings */ - SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) TestItem1); - p = buf; - es.dwCookie = (DWORD_PTR)&p; - es.dwError = 0; - es.pfnCallback = test_WM_SETTEXT_esCallback; - memset(buf, 0, sizeof(buf)); - SendMessage(hwndRichEdit, EM_STREAMOUT, - (WPARAM)(SF_RTF), (LPARAM)&es); - trace("EM_STREAMOUT produced:\n%s\n", buf); - TEST_SETTEXT(buf, TestItem1) - + /* The following tests demonstrate that WM_SETTEXT supports RTF strings */ + TEST_SETTEXT(rtftextA, "sometext") /* interpreted as ascii rtf */ + TEST_SETTEXT(urtftextA, "sometext") /* interpreted as ascii rtf */ + TEST_SETTEXT(rtftextW, "{") /* interpreted as ascii text */ + TEST_SETTEXT(urtftextW, "{") /* interpreted as ascii text */ + DestroyWindow(hwndRichEdit); #undef TEST_SETTEXT + +#define TEST_SETTEXTW(a, b) \ + result = SendMessageW(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) a); \ + ok (result == 1, "WM_SETTEXT returned %ld instead of 1\n", result); \ + result = SendMessageW(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) bufW); \ + ok (result == lstrlenW(bufW), \ + "WM_GETTEXT returned %ld instead of expected %u\n", \ + result, lstrlenW(bufW)); \ + result = lstrcmpW(b, bufW); \ + ok(result == 0, "WM_SETTEXT round trip: strcmp = %ld\n", result); + + if (is_win9x) + { + skip("Cannot perform unicode tests\n"); + return; + } +hwndRichEdit = CreateWindowW(RICHEDIT_CLASS20W, NULL, + ES_MULTILINE|WS_POPUP|WS_HSCROLL|WS_VSCROLL|WS_VISIBLE, + 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwndRichEdit != NULL, "class: RichEdit20W, error: %d\n", (int) GetLastError()); + TEST_SETTEXTW(rtftextA, sometextW) /* interpreted as ascii rtf */ + TEST_SETTEXTW(urtftextA, sometextW) /* interpreted as ascii rtf */ + TEST_SETTEXTW(rtftextW, rtftextW) /* interpreted as ascii text */ + TEST_SETTEXTW(urtftextW, urtftextW) /* interpreted as ascii text */ DestroyWindow(hwndRichEdit); +#undef TEST_SETTEXTW } static void test_EM_STREAMOUT(void)

1 0

Dylan Smith : richedit: Support ascii RTF in WM_SETTEXT even for unicode messages.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 88c2b90aa63b3a893f6edc0ffb4f652889a02c39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88c2b90aa63b3a893f6edc0ff… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Jul 10 23:54:34 2009 -0400 richedit: Support ascii RTF in WM_SETTEXT even for unicode messages. WM_SETTEXT seems to check for {\rtf or {\urtf to determine if it is an ascii RTF string, even if it is a unicode message. So I removed the check to see if it is a unicode message, and added a check for {\urtf. --- dlls/riched20/editor.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 278b9aa..4cd72c8 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3194,7 +3194,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, /* If we detect ascii rtf at the start of the string, * we know it isn't unicode. */ bRtf = (lParam && (!strncmp((char *)lParam, "{\\rtf", 5) || - !strncmp((char *)lParam, "{\\urtf}", 6))); + !strncmp((char *)lParam, "{\\urtf", 6))); bUnicode = !bRtf && pStruct->codepage == 1200; TRACE("EM_SETTEXTEX - %s, flags %d, cp %d\n", @@ -3463,7 +3463,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if (lParam) { TRACE("WM_SETTEXT lParam==%lx\n",lParam); - if (!unicode && !strncmp((char *)lParam, "{\\rtf", 5)) + if (!strncmp((char *)lParam, "{\\rtf", 5) || + !strncmp((char *)lParam, "{\\urtf", 6)) { /* Undocumented: WM_SETTEXT supports RTF text */ ME_StreamInRTFString(editor, 0, (char *)lParam);

1 0

Huw Davies : gdi32/tests: Allow a small tolerance when comparing scaling values.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: e5c614e6b144c06bc1950dc45f75d8bf5fdfb036 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5c614e6b144c06bc1950dc45… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 10 14:47:50 2009 +0100 gdi32/tests: Allow a small tolerance when comparing scaling values. --- dlls/gdi32/tests/metafile.c | 48 ++++++++++++++++++------------------------ 1 files changed, 21 insertions(+), 27 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 2eacd37..4a081d6 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2308,19 +2308,14 @@ static void test_SetWinMetaFileBits(void) HeapFree(GetProcessHeap(), 0, buffer); } -/* This is somewhat different to MulDiv, but appears to be how native behaves */ -static INT muldiv(INT m1, INT m2, INT d) +static BOOL near_match(int x, int y) { - LONGLONG ret; + int epsilon = min(abs(x), abs(y)); - ret = ((LONGLONG)m1 * m2 + d/2) / d; /* Always add d/2 even if ret will be -ve */ + epsilon = max(epsilon/100, 2); - if((LONGLONG)m1 * m2 * 2 == (2 * ret - 1) * d) /* If the answer is exactly n.5 round towards zero */ - { - if(ret > 0) ret--; - else ret++; - } - return ret; + if(x < y - epsilon || x > y + epsilon) return FALSE; + return TRUE; } static void getwinmetafilebits(UINT mode, int scale, RECT *rc) @@ -2422,43 +2417,42 @@ static void getwinmetafilebits(UINT mode, int scale, RECT *rc) case MM_TEXT: case MM_ISOTROPIC: case MM_ANISOTROPIC: - pt.y = muldiv(rc->top, vert_res, vert_size * 100); - pt.x = muldiv(rc->left, horz_res, horz_size * 100); + pt.y = MulDiv(rc->top, vert_res, vert_size * 100) + 1; + pt.x = MulDiv(rc->left, horz_res, horz_size * 100); break; case MM_LOMETRIC: - pt.y = muldiv(-rc->top, 1, 10) + 1; - pt.x = muldiv( rc->left, 1, 10); + pt.y = MulDiv(-rc->top, 1, 10) + 1; + pt.x = MulDiv( rc->left, 1, 10); break; case MM_HIMETRIC: pt.y = -rc->top + 1; pt.x = (rc->left >= 0) ? rc->left : rc->left + 1; /* strange but true */ break; case MM_LOENGLISH: - pt.y = muldiv(-rc->top, 10, 254) + 1; - pt.x = muldiv( rc->left, 10, 254); + pt.y = MulDiv(-rc->top, 10, 254) + 1; + pt.x = MulDiv( rc->left, 10, 254); break; case MM_HIENGLISH: - pt.y = muldiv(-rc->top, 100, 254) + 1; - pt.x = muldiv( rc->left, 100, 254); + pt.y = MulDiv(-rc->top, 100, 254) + 1; + pt.x = MulDiv( rc->left, 100, 254); break; case MM_TWIPS: - pt.y = muldiv(-rc->top, 72 * 20, 2540) + 1; - pt.x = muldiv( rc->left, 72 * 20, 2540); + pt.y = MulDiv(-rc->top, 72 * 20, 2540) + 1; + pt.x = MulDiv( rc->left, 72 * 20, 2540); break; default: pt.x = pt.y = 0; } - ok((short)rec->rdParm[0] == pt.y || - broken(mode >= MM_LOMETRIC && mode <= MM_TWIPS && (short)rec->rdParm[0] == pt.y - 1), /* win9x, winme */ - "got %d expect %d\n", (short)rec->rdParm[0], pt.y); - ok((short)rec->rdParm[1] == pt.x, "got %d expect %d\n", (short)rec->rdParm[1], pt.x); + ok(near_match((short)rec->rdParm[0], pt.y), "got %d expect %d\n", (short)rec->rdParm[0], pt.y); + ok(near_match((short)rec->rdParm[1], pt.x), "got %d expect %d\n", (short)rec->rdParm[1], pt.x); } if(rec_num == mfcomment_chunks + 2) { ok(rec->rdFunction == META_SETWINDOWEXT, "got %04x\n", rec->rdFunction); - ok((short)rec->rdParm[0] == muldiv(rc->bottom - rc->top, vert_res, vert_size * 100), "got %d\n", (short)rec->rdParm[0]); - ok((short)rec->rdParm[1] == muldiv(rc->right - rc->left, horz_res, horz_size * 100), "got %d\n", (short)rec->rdParm[1]); - + ok(near_match((short)rec->rdParm[0], MulDiv(rc->bottom - rc->top, vert_res, vert_size * 100)), + "got %d\n", (short)rec->rdParm[0]); + ok(near_match((short)rec->rdParm[1], MulDiv(rc->right - rc->left, horz_res, horz_size * 100)), + "got %d\n", (short)rec->rdParm[1]); } rec_num++;

1 0

Jacek Caban : wininet: Rename WININETFTPFILEW to ftp_file_t.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 54870c1431d14ae0601c2ffe6dd5c9e2745b117d URL: http://source.winehq.org/git/wine.git/?a=commit;h=54870c1431d14ae0601c2ffe6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 13 01:46:44 2009 +0200 wininet: Rename WININETFTPFILEW to ftp_file_t. --- dlls/wininet/ftp.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index f809568..fcc9d9e 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -76,7 +76,7 @@ typedef struct ftp_session_t *lpFtpSession; BOOL session_deleted; int nDataSocket; -} WININETFTPFILE, *LPWININETFTPFILE; +} ftp_file_t; struct _ftp_session_t { @@ -85,7 +85,7 @@ struct _ftp_session_t int sndSocket; int lstnSocket; int pasvSocket; /* data socket connected by us in case of passive FTP */ - LPWININETFTPFILE download_in_progress; + ftp_file_t *download_in_progress; struct sockaddr_in socketAddress; struct sockaddr_in lstnSocketAddress; LPWSTR lpszPassword; @@ -1086,7 +1086,7 @@ lend: */ static void FTPFILE_Destroy(object_header_t *hdr) { - LPWININETFTPFILE lpwh = (LPWININETFTPFILE) hdr; + ftp_file_t *lpwh = (ftp_file_t*) hdr; ftp_session_t *lpwfs = lpwh->lpFtpSession; INT nResCode; @@ -1125,7 +1125,7 @@ static DWORD FTPFILE_QueryOption(object_header_t *hdr, DWORD option, void *buffe static DWORD FTPFILE_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DWORD *read) { - WININETFTPFILE *file = (WININETFTPFILE*)hdr; + ftp_file_t *file = (ftp_file_t*)hdr; int res; if (file->nDataSocket == -1) @@ -1152,7 +1152,7 @@ static DWORD FTPFILE_ReadFileExW(object_header_t *hdr, INTERNET_BUFFERSW *buffer static BOOL FTPFILE_WriteFile(object_header_t *hdr, const void *buffer, DWORD size, DWORD *written) { - LPWININETFTPFILE lpwh = (LPWININETFTPFILE) hdr; + ftp_file_t *lpwh = (ftp_file_t*) hdr; int res; res = send(lpwh->nDataSocket, buffer, size, 0); @@ -1161,7 +1161,7 @@ static BOOL FTPFILE_WriteFile(object_header_t *hdr, const void *buffer, DWORD si return res >= 0; } -static void FTP_ReceiveRequestData(WININETFTPFILE *file, BOOL first_notif) +static void FTP_ReceiveRequestData(ftp_file_t *file, BOOL first_notif) { INTERNET_ASYNC_RESULT iar; BYTE buffer[4096]; @@ -1185,14 +1185,14 @@ static void FTP_ReceiveRequestData(WININETFTPFILE *file, BOOL first_notif) static void FTPFILE_AsyncQueryDataAvailableProc(WORKREQUEST *workRequest) { - WININETFTPFILE *file = (WININETFTPFILE*)workRequest->hdr; + ftp_file_t *file = (ftp_file_t*)workRequest->hdr; FTP_ReceiveRequestData(file, FALSE); } static DWORD FTPFILE_QueryDataAvailable(object_header_t *hdr, DWORD *available, DWORD flags, DWORD_PTR ctx) { - LPWININETFTPFILE file = (LPWININETFTPFILE) hdr; + ftp_file_t *file = (ftp_file_t*) hdr; int retval, unread = 0; TRACE("(%p %p %x %lx)\n", file, available, flags, ctx); @@ -1259,7 +1259,7 @@ HINTERNET FTP_FtpOpenFileW(ftp_session_t *lpwfs, { INT nDataSocket; BOOL bSuccess = FALSE; - LPWININETFTPFILE lpwh = NULL; + ftp_file_t *lpwh = NULL; appinfo_t *hIC = NULL; HINTERNET handle = NULL; @@ -1282,7 +1282,7 @@ HINTERNET FTP_FtpOpenFileW(ftp_session_t *lpwfs, /* Get data socket to server */ if (bSuccess && FTP_GetDataSocket(lpwfs, &nDataSocket)) { - lpwh = HeapAlloc(GetProcessHeap(), 0, sizeof(WININETFTPFILE)); + lpwh = HeapAlloc(GetProcessHeap(), 0, sizeof(ftp_file_t)); lpwh->hdr.htype = WH_HFILE; lpwh->hdr.vtbl = &FTPFILEVtbl; lpwh->hdr.dwFlags = dwFlags;

1 0

Jacek Caban : wininet: Rename WININETFTPSESSIONW to ftp_session_t.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 8adbf8ce0185e842c8110503038b2f18d3a0c74b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8adbf8ce0185e842c81105030… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 13 01:45:53 2009 +0200 wininet: Rename WININETFTPSESSIONW to ftp_session_t. --- dlls/wininet/ftp.c | 189 ++++++++++++++++++++++++++-------------------------- 1 files changed, 94 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8adbf8ce0185e842c8110…

1 0