wine-commits October 2013

wine-commits@winehq.org

2 participants
757 discussions

Volkan Gezer : Turkish translation update for version 1.7.5
by Jeremy Newman 30 Oct '13

30 Oct '13

Module: website Branch: master Commit: c983dde86665b241076ce793ca19e0d308fb1519 URL: http://source.winehq.org/git/website.git/?a=commit;h=c983dde86665b241076ce7… Author: Volkan Gezer <vlkngzr(a)gmail.com> Date: Wed Oct 30 12:35:19 2013 +0100 Turkish translation update for version 1.7.5 --- news/tr/2013102501.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/tr/2013102501.xml b/news/tr/2013102501.xml new file mode 100644 index 0000000..55704ae --- /dev/null +++ b/news/tr/2013102501.xml @@ -0,0 +1,16 @@ +<news> +<date>125 Ekim 2013</date> +<title>Wine 1.7.5 Yayınlandı</title> +<body> + Wine geliştirme sürümü 1.7.5 artık kullanılabilir. + Bu sürümdeki <a href="{$root}/announce/1.7.5">yenilikler</a>: +<ul> + <li>Etkileşim bağlamları kullanarak kayıtsız COM desteği</li> + <li>Benzetimli kalın yazı tipleri için iyileştirilmiş destek</li> + <li>Unicode verisi Unicode 6.3'e güncellendi.</li> + <li>64-bit'te typelib kaydı için daha iyi destek</li> + <li>Çeşitli hata onarımları.</li> +</ul> +Kaynak dosyaları <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.5.tar.bz2">artık indirilebilir</a>. +İnşa sürecindeki ikili paketler kısa zaman içinde <a href="{$root}/download">indirme</a> konumunda yerini alacaktır. +</body></news> \ No newline at end of file

1 0

Volkan Gezer : po: Updated Turkish translation.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: a90fee9f3def10a02425419fa3e4f8738d5f0546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a90fee9f3def10a02425419fa… Author: Volkan Gezer <volkangezer(a)gmail.com> Date: Wed Oct 30 12:45:36 2013 +0100 po: Updated Turkish translation. --- po/tr.po | 94 +++++++++++++++++++++++++------------------------------------- 1 files changed, 38 insertions(+), 56 deletions(-) diff --git a/po/tr.po b/po/tr.po index 8e5acd6..eea67af 100644 --- a/po/tr.po +++ b/po/tr.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: 2013-07-13 04:49+0200\n" +"PO-Revision-Date: 2013-10-30 12:44+0100\n" "Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>\n" "Language-Team: Turkish <kde-l10n-tr(a)kde.org>\n" "Language: Turkish\n" @@ -4248,7 +4248,7 @@ msgstr "" #: winerror.mc:806 msgid "Environment variable not found.\n" -msgstr "" +msgstr "Ortam değişkeni bulunamadı.\n" #: winerror.mc:811 msgid "No signal sent.\n" @@ -4260,11 +4260,11 @@ msgstr "Dosya adı çok uzun.\n" #: winerror.mc:821 msgid "Ring 2 stack in use.\n" -msgstr "" +msgstr "Halka 2 yığını kullanımda.\n" #: winerror.mc:826 msgid "Error in use of filename wildcards.\n" -msgstr "" +msgstr "Dosya adı joker karakteri kullanımında hata.\n" #: winerror.mc:831 msgid "Invalid signal number.\n" @@ -4276,7 +4276,7 @@ msgstr "Sinyal ele alıcısı ayarlanırken hata.\n" #: winerror.mc:841 msgid "Segment locked.\n" -msgstr "" +msgstr "Bölüm kilitli.\n" #: winerror.mc:846 msgid "Too many modules.\n" @@ -4288,7 +4288,7 @@ msgstr "" #: winerror.mc:856 msgid "Machine type mismatch.\n" -msgstr "" +msgstr "Makine tür uyumsuzluğu.\n" #: winerror.mc:861 msgid "Bad pipe.\n" @@ -4364,7 +4364,7 @@ msgstr "" #: winerror.mc:951 msgid "Read/WriteProcessMemory partially completed.\n" -msgstr "" +msgstr "Read/WriteProcessMemory kısmen tamamlandı.\n" #: winerror.mc:956 msgid "The oplock wasn't granted.\n" @@ -4376,7 +4376,7 @@ msgstr "" #: winerror.mc:966 msgid "Message 0x%1 not found in file %2.\n" -msgstr "" +msgstr "0x%1 iletisi %2 dosyasında bulunamadı.\n" #: winerror.mc:971 msgid "Invalid address.\n" @@ -4384,7 +4384,7 @@ msgstr "Geçersiz adres.\n" #: winerror.mc:976 msgid "Arithmetic overflow.\n" -msgstr "" +msgstr "Aritmetik taşma.\n" #: winerror.mc:981 msgid "Pipe connected.\n" @@ -4396,11 +4396,11 @@ msgstr "İletişim tüneli dinleniyor.\n" #: winerror.mc:991 msgid "Extended attribute access denied.\n" -msgstr "" +msgstr "Uzatılmış nitelik erişimi reddedildi.\n" #: winerror.mc:996 msgid "I/O operation aborted.\n" -msgstr "" +msgstr "G/Ç işlemi iptal edildi.\n" #: winerror.mc:1001 msgid "Overlapped I/O incomplete.\n" @@ -4924,15 +4924,15 @@ msgstr "" #: winerror.mc:1651 msgid "Invalid network provider name.\n" -msgstr "" +msgstr "Geçersiz ağ sağlayıcı adı.\n" #: winerror.mc:1656 msgid "Cannot open network connection profile.\n" -msgstr "" +msgstr "Ağ bağlantı profili açılamıyor.\n" #: winerror.mc:1661 msgid "Corrupt network connection profile.\n" -msgstr "" +msgstr "Ağ bağlantı profili bozuk.\n" #: winerror.mc:1666 msgid "Not a container.\n" @@ -5004,11 +5004,11 @@ msgstr "" #: winerror.mc:1756 winerror.mc:3741 msgid "Connection refused.\n" -msgstr "" +msgstr "Bağlantı reddedildi.\n" #: winerror.mc:1761 msgid "Connection gracefully closed.\n" -msgstr "" +msgstr "Bağlantı dikkatlice kapatıldı.\n" #: winerror.mc:1766 msgid "Address already associated with transport endpoint.\n" @@ -5340,15 +5340,15 @@ msgstr "" #: winerror.mc:2176 msgid "No such domain.\n" -msgstr "" +msgstr "Böyle bir etki alanı yok.\n" #: winerror.mc:2181 msgid "Domain already exists.\n" -msgstr "" +msgstr "Etki alanı zaten mevcut.\n" #: winerror.mc:2186 msgid "Domain limit exceeded.\n" -msgstr "" +msgstr "Etki alanı sınırı aşıldı.\n" #: winerror.mc:2191 msgid "Internal database corruption.\n" @@ -5488,19 +5488,19 @@ msgstr "" #: winerror.mc:2366 msgid "Disk is corrupt.\n" -msgstr "" +msgstr "Disk bozuk.\n" #: winerror.mc:2371 msgid "No user session key.\n" -msgstr "" +msgstr "Kullanıcı oturum anahtarı yok.\n" #: winerror.mc:2376 msgid "License quota exceeded.\n" -msgstr "" +msgstr "Lisans kotası aşıldı.\n" #: winerror.mc:2381 msgid "Wrong target name.\n" -msgstr "" +msgstr "Hatalı hedef adı.\n" #: winerror.mc:2386 msgid "Mutual authentication failed.\n" @@ -5792,19 +5792,19 @@ msgstr "" #: winerror.mc:2746 msgid "Unknown product.\n" -msgstr "" +msgstr "Bilinmeyen ürün.\n" #: winerror.mc:2751 msgid "Unknown feature.\n" -msgstr "" +msgstr "Bilinmeyen özellik.\n" #: winerror.mc:2756 msgid "Unknown component.\n" -msgstr "" +msgstr "Bilinmeyen bileşen.\n" #: winerror.mc:2761 msgid "Unknown property.\n" -msgstr "" +msgstr "Bilinmeyen özellik.\n" #: winerror.mc:2766 msgid "Invalid handle state.\n" @@ -5824,11 +5824,11 @@ msgstr "" #: winerror.mc:2786 msgid "Wrong installation package version.\n" -msgstr "" +msgstr "Hatalı kurulum paket sürümü.\n" #: winerror.mc:2791 msgid "Product uninstalled.\n" -msgstr "" +msgstr "Ürün kaldırıldı.\n" #: winerror.mc:2796 msgid "Invalid query syntax.\n" @@ -8524,16 +8524,12 @@ msgstr "" "yeniden deneyin." #: winmm.rc:52 winmm.rc:125 -#, fuzzy -#| msgid "" -#| "The current MIDI Mapper setup refers to a MIDI device that is not " -#| "installed on the system. Use MIDI Mapper to edit the setup." msgid "" "The current MIDI Mapper setup refers to a MIDI device that is not installed " "on the system." msgstr "" "Geçerli MIDI Eşleyicisi kurulumu sistemde yüklü olmayan bir MIDI aygıtını " -"gösteriyor. Kurulumu düzenlemek için MIDI Eşleyicisini kullanın." +"gösteriyor." #: winmm.rc:53 msgid "" @@ -9354,22 +9350,16 @@ msgstr "" "kendisini çağıran tarafından miras alınır.\n" #: cmd.rc:40 -#, fuzzy -#| msgid "" -#| "CD <dir> is the short version of CHDIR. It changes the current\n" -#| "default directory.\n" msgid "" "CD <directory> is the short version of CHDIR. It changes the current\n" "default directory.\n" msgstr "" -"CD <dir> CHDIR komutunun kısa sürümüdür. Geçerli\n" -"varsayılan dizini değiştirir.\n" +"CD <dizin> CHDIR komutunun kısa sürümüdür. Geçerli\n" +"öntanımlı dizini değiştirir.\n" #: cmd.rc:41 -#, fuzzy -#| msgid "CHDIR <dir> changes the current default directory.\n" msgid "CHDIR <directory> changes the current default directory.\n" -msgstr "CHDIR <dizin> geçerli varsayılan dizini değiştirir.\n" +msgstr "CHDIR <dizin> geçerli öntanımlı dizini değiştirir.\n" #: cmd.rc:43 msgid "CLS clears the console screen.\n" @@ -9420,11 +9410,6 @@ msgid "ERASE <filename> deletes a file or set of files.\n" msgstr "ERASE <dosyaadı> bir veya birçok dosyayı siler.\n" #: cmd.rc:68 -#, fuzzy -#| msgid "" -#| "The FOR command is used to execute a command for each of a set of files.\n" -#| "\n" -#| "Syntax: FOR %variable IN (set) DO command\n" msgid "" "The FOR command is used to execute a command for each of a set of files.\n" "\n" @@ -9435,7 +9420,9 @@ msgstr "" "FOR komutu bir dosya kümesinin her öğesi için bir komut çalıştırmada\n" "kullanılır.\n" "\n" -"Sözdizim: FOR %değişken IN (küme) DO komut\n" +"Kullanım: FOR %değişken IN (küme) DO komut\n" +"\n" +"% sembolü toplu iş dosyasında FOR kullanılırken iki kez kullanılmalıdır.\n" #: cmd.rc:80 msgid "" @@ -9626,17 +9613,12 @@ msgid "RENAME <filename> renames a file.\n" msgstr "RENAME <dosyaadı> bir dosyayı yeniden adlandırır.\n" #: cmd.rc:158 -#, fuzzy -#| msgid "" -#| "MD <name> is the short version of MKDIR. It creates a subdirectory.\n" msgid "RD <directory> is the short version of RMDIR. It deletes a directory.\n" -msgstr "MD <isim> MKDIR komutunun kısa sürümüdür. Bir alt dizin oluşturur.\n" +msgstr "RD <dizin> RMDIR komutunun kısa sürümüdür. Bir dizini siler.\n" #: cmd.rc:159 -#, fuzzy -#| msgid "MKDIR <name> creates a subdirectory.\n" msgid "RMDIR <directory> deletes a directory.\n" -msgstr "MKDIR <isim> bir alt dizin oluşturur.\n" +msgstr "RMDIR <dizin> bir dizini siler.\n" #: cmd.rc:203 msgid ""

1 0

Ken Thomases : winemac: Hide cursor when first requested even if we don' t know it's over a window.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: 6b9f81271b4b150244ed37fbda79103ba16dcbf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b9f81271b4b150244ed37fbd… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Oct 30 08:07:51 2013 -0500 winemac: Hide cursor when first requested even if we don't know it's over a window. The tracking of whether it is over a window or not is only updated when the mouse moves. If a window was created or moved under it, then the state can be stale. That caused us to defer hiding the cursor until the mouse was moved. This happens at the start of games pretty often. --- dlls/winemac.drv/cocoa_app.m | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index e888a50..f351f33 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -787,9 +787,9 @@ int macdrv_err_on; return ([originalDisplayModes count] > 0 || displaysCapturedForFullscreen); } - - (void) updateCursor + - (void) updateCursor:(BOOL)force { - if (lastTargetWindow) + if (force || lastTargetWindow) { if (clientWantsCursorHidden && !cursorHidden) { @@ -829,7 +829,7 @@ int macdrv_err_on; if (!clientWantsCursorHidden) { clientWantsCursorHidden = TRUE; - [self updateCursor]; + [self updateCursor:TRUE]; } } @@ -838,7 +838,7 @@ int macdrv_err_on; if (clientWantsCursorHidden) { clientWantsCursorHidden = FALSE; - [self updateCursor]; + [self updateCursor:FALSE]; } } @@ -849,7 +849,7 @@ int macdrv_err_on; [cursor release]; cursor = [newCursor retain]; cursorIsCurrent = FALSE; - [self updateCursor]; + [self updateCursor:FALSE]; } } @@ -1516,7 +1516,7 @@ int macdrv_err_on; else lastTargetWindow = nil; - [self updateCursor]; + [self updateCursor:FALSE]; } - (void) handleMouseButton:(NSEvent*)theEvent

1 0

Ken Thomases : winemac: Don' t use the main dispatch queue to implement OnMainThread() for a thread with no event queue.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: 2f68e47167925993947ac07e360e9fa251c50979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f68e47167925993947ac07e3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Oct 30 05:52:58 2013 -0500 winemac: Don't use the main dispatch queue to implement OnMainThread() for a thread with no event queue. The main dispatch queue is a serial queue and is a shared resource. If we submit a long-running task to it, then no other tasks, including those submitted by the system frameworks, can run until it completes. --- dlls/winemac.drv/cocoa_event.m | 49 +++++++++++++++++++++++++-------------- 1 files changed, 31 insertions(+), 18 deletions(-) diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index 3b35576..13f9695 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -460,42 +460,55 @@ void OnMainThread(dispatch_block_t block) NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; NSMutableDictionary* threadDict = [[NSThread currentThread] threadDictionary]; WineEventQueue* queue = [threadDict objectForKey:WineEventQueueThreadDictionaryKey]; + dispatch_semaphore_t semaphore; __block BOOL finished; if (!queue) { - /* Fall back to synchronous dispatch without handling query events. */ - dispatch_sync(dispatch_get_main_queue(), block); - [pool release]; - return; + semaphore = dispatch_semaphore_create(0); + dispatch_retain(semaphore); } finished = FALSE; OnMainThreadAsync(^{ block(); finished = TRUE; - [queue signalEventAvailable]; + if (queue) + [queue signalEventAvailable]; + else + { + dispatch_semaphore_signal(semaphore); + dispatch_release(semaphore); + } }); - while (!finished) + if (queue) { - MacDrvEvent* macDrvEvent; - struct kevent kev; - - while (!finished && - (macDrvEvent = [queue getEventMatchingMask:event_mask_for_type(QUERY_EVENT)])) + while (!finished) { - queue->event_handler(macDrvEvent->event); - } + MacDrvEvent* macDrvEvent; + struct kevent kev; - if (!finished) - { - [pool release]; - pool = [[NSAutoreleasePool alloc] init]; + while (!finished && + (macDrvEvent = [queue getEventMatchingMask:event_mask_for_type(QUERY_EVENT)])) + { + queue->event_handler(macDrvEvent->event); + } + + if (!finished) + { + [pool release]; + pool = [[NSAutoreleasePool alloc] init]; - kevent(queue->kq, NULL, 0, &kev, 1, NULL); + kevent(queue->kq, NULL, 0, &kev, 1, NULL); + } } } + else + { + dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER); + dispatch_release(semaphore); + } [pool release]; }

1 0

Dmitry Timoshkov : msi: Check number of bytes returned by ReadFile.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: a5b51a766b2d618efde50ef8924d2206777da8a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5b51a766b2d618efde50ef89… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 29 16:09:13 2013 +0900 msi: Check number of bytes returned by ReadFile. --- dlls/msi/record.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/record.c b/dlls/msi/record.c index a44f42d..3c1cf00 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -683,7 +683,7 @@ static UINT RECORD_StreamFromFile(LPCWSTR szFile, IStream **pstm) hGlob = GlobalAlloc(GMEM_FIXED, sz); if( hGlob ) { - BOOL r = ReadFile(handle, hGlob, sz, &read, NULL); + BOOL r = ReadFile(handle, hGlob, sz, &read, NULL) && read == sz; if( !r ) { GlobalFree(hGlob);

1 0

Dmitry Timoshkov : oleaut32: Check number of bytes returned by ReadFile.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: 724eda257f9f5fcaf1fcbb4d89ffc8ad56472068 URL: http://source.winehq.org/git/wine.git/?a=commit;h=724eda257f9f5fcaf1fcbb4d8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 29 16:09:22 2013 +0900 oleaut32: Check number of bytes returned by ReadFile. --- dlls/oleaut32/olepicture.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 4b3e9dd..2772a2f 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -2273,7 +2273,7 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, HANDLE hFile; DWORD dwFileSize; HGLOBAL hGlobal = NULL; - DWORD dwBytesRead = 0; + DWORD dwBytesRead; IStream *stream; BOOL bRead; IPersistStream *pStream; @@ -2317,7 +2317,7 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, hGlobal = GlobalAlloc(GMEM_FIXED,dwFileSize); if ( hGlobal) { - bRead = ReadFile(hFile, hGlobal, dwFileSize, &dwBytesRead, NULL); + bRead = ReadFile(hFile, hGlobal, dwFileSize, &dwBytesRead, NULL) && dwBytesRead == dwFileSize; if (!bRead) { GlobalFree(hGlobal);

1 0

Dmitry Timoshkov : crypt32: Check number of bytes returned by ReadFile and avoid a memory leak on error path .
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: 99a81e18434e6e4aae50628ad0803cf753397c22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99a81e18434e6e4aae50628ad… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 29 16:09:05 2013 +0900 crypt32: Check number of bytes returned by ReadFile and avoid a memory leak on error path. --- dlls/crypt32/object.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 0ff1bfd..39955ce 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -52,7 +52,8 @@ static BOOL CRYPT_ReadBlobFromFile(LPCWSTR fileName, PCERT_BLOB blob) { DWORD read; - ret = ReadFile(file, blob->pbData, blob->cbData, &read, NULL); + ret = ReadFile(file, blob->pbData, blob->cbData, &read, NULL) && read == blob->cbData; + if (!ret) CryptMemFree(blob->pbData); } } CloseHandle(file);

1 0

Dmitry Timoshkov : crypt32: Check number of bytes returned by ReadFile and avoid a memory leak on error path .
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: d95797e17052b5a91373f8ea604365de9b2e5fd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d95797e17052b5a91373f8ea6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 29 16:08:59 2013 +0900 crypt32: Check number of bytes returned by ReadFile and avoid a memory leak on error path. --- dlls/crypt32/filestore.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/filestore.c b/dlls/crypt32/filestore.c index 44b9bbb..81c8c5e 100644 --- a/dlls/crypt32/filestore.c +++ b/dlls/crypt32/filestore.c @@ -119,7 +119,8 @@ static BOOL CRYPT_ReadBlobFromFile(HANDLE file, PCERT_BLOB blob) { DWORD read; - ret = ReadFile(file, blob->pbData, blob->cbData, &read, NULL); + ret = ReadFile(file, blob->pbData, blob->cbData, &read, NULL) && read == blob->cbData; + if (!ret) CryptMemFree(blob->pbData); } } return ret;

1 0

Henri Verbeet : d3drm: Get rid of the Coords2d typedef.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: 71168d9dcc84849755328a9042a4f8679cd2c74b URL: http://source.winehq.org/git/wine.git/?a=commit;h=71168d9dcc84849755328a904… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 30 10:17:56 2013 +0100 d3drm: Get rid of the Coords2d typedef. --- dlls/d3drm/meshbuilder.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 87203b7..5e776d5 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -56,10 +56,11 @@ struct d3drm_mesh struct mesh_group *groups; }; -typedef struct { +struct coords_2d +{ D3DVALUE u; D3DVALUE v; -} Coords2d; +}; typedef struct { D3DCOLOR color; @@ -80,7 +81,7 @@ typedef struct { DWORD face_data_size; void *pFaceData; DWORD nb_coords2d; - Coords2d *pCoords2d; + struct coords_2d *pCoords2d; D3DCOLOR color; IDirect3DRMMaterial2 *material; IDirect3DRMTexture3 *texture; @@ -1210,8 +1211,8 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, TRACE("MeshTextureCoords: nb_coords2d = %d\n", This->nb_coords2d); - This->pCoords2d = HeapAlloc(GetProcessHeap(), 0, This->nb_coords2d * sizeof(Coords2d)); - memcpy(This->pCoords2d, ptr + sizeof(DWORD), This->nb_coords2d * sizeof(Coords2d)); + This->pCoords2d = HeapAlloc(GetProcessHeap(), 0, This->nb_coords2d * sizeof(*This->pCoords2d)); + memcpy(This->pCoords2d, ptr + sizeof(DWORD), This->nb_coords2d * sizeof(*This->pCoords2d)); } else if (IsEqualGUID(guid, &TID_D3DRMMeshMaterialList)) @@ -1490,7 +1491,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, if (!This->pCoords2d) { This->nb_coords2d = This->nb_vertices; - This->pCoords2d = HeapAlloc(GetProcessHeap(), 0, This->nb_coords2d * sizeof(Coords2d)); + This->pCoords2d = HeapAlloc(GetProcessHeap(), 0, This->nb_coords2d * sizeof(*This->pCoords2d)); for (i = 0; i < This->nb_coords2d; i++) { This->pCoords2d[i].u = 0.0f;

1 0

Henri Verbeet : d3drm: Get rid of the IDirect3DRMMeshImpl typedef.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: 64a778848fd43ea908688f38e2e1506f28ce16cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=64a778848fd43ea908688f38e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 30 10:17:55 2013 +0100 d3drm: Get rid of the IDirect3DRMMeshImpl typedef. --- dlls/d3drm/meshbuilder.c | 392 +++++++++++++++++++++------------------------- 1 files changed, 179 insertions(+), 213 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64a778848fd43ea908688…

1 0

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 October 2013