June 2014 - Wine-Commits - list.winehq.org

Alex Henrie : riched20: Consider adjacent runs when computing EN_LINK range.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: 6b947701a763ba7fe141ffa2a080d4c04cd6a15a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b947701a763ba7fe141ffa2a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 15 23:15:43 2014 -0600 riched20: Consider adjacent runs when computing EN_LINK range. --- dlls/riched20/editor.c | 21 +++++++++++++++- dlls/riched20/tests/editor.c | 57 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 0127616..2af2582 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3093,6 +3093,8 @@ static void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM if (cursor.pRun->member.run.style->fmt.dwMask & CFM_LINK && cursor.pRun->member.run.style->fmt.dwEffects & CFE_LINK) { /* The clicked run has CFE_LINK set */ + ME_DisplayItem *di; + info.nmhdr.hwndFrom = NULL; info.nmhdr.idFrom = 0; info.nmhdr.code = EN_LINK; @@ -3100,8 +3102,25 @@ static void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM info.wParam = wParam; info.lParam = lParam; cursor.nOffset = 0; + + /* find the first contiguous run with CFE_LINK set */ info.chrg.cpMin = ME_GetCursorOfs(&cursor); - info.chrg.cpMax = info.chrg.cpMin + cursor.pRun->member.run.len; + for (di = cursor.pRun->prev; + di && di->type == diRun && (di->member.run.style->fmt.dwMask & CFM_LINK) && (di->member.run.style->fmt.dwEffects & CFE_LINK); + di = di->prev) + { + info.chrg.cpMin -= di->member.run.len; + } + + /* find the last contiguous run with CFE_LINK set */ + info.chrg.cpMax = ME_GetCursorOfs(&cursor) + cursor.pRun->member.run.len; + for (di = cursor.pRun->next; + di && di->type == diRun && (di->member.run.style->fmt.dwMask & CFM_LINK) && (di->member.run.style->fmt.dwEffects & CFE_LINK); + di = di->next) + { + info.chrg.cpMax += di->member.run.len; + } + ITextHost_TxNotify(editor->texthost, info.nmhdr.code, &info); } } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 2a85357..5421614 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5937,6 +5937,62 @@ static void test_WM_NOTIFY(void) DestroyWindow(parent); } +static int cpMin_EN_LINK = -1; +static int cpMax_EN_LINK = -1; + +static LRESULT WINAPI EN_LINK_ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + ENLINK* enlink = (ENLINK*)lParam; + if(message == WM_NOTIFY && enlink->nmhdr.code == EN_LINK) + { + cpMin_EN_LINK = enlink->chrg.cpMin; + cpMax_EN_LINK = enlink->chrg.cpMax; + } + return DefWindowProcA(hwnd, message, wParam, lParam); +} + +static void test_EN_LINK(void) +{ + HWND parent; + WNDCLASSA cls; + HWND hwndRichedit_EN_LINK; + CHARFORMAT2A cf2; + + /* register class to capture WM_NOTIFY */ + cls.style = 0; + cls.lpfnWndProc = EN_LINK_ParentMsgCheckProcA; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "EN_LINK_ParentClass"; + if(!RegisterClassA(&cls)) assert(0); + + parent = CreateWindowA(cls.lpszClassName, NULL, WS_POPUP|WS_VISIBLE, + 0, 0, 200, 60, NULL, NULL, NULL, NULL); + ok(parent != 0, "Failed to create parent window\n"); + + hwndRichedit_EN_LINK = new_richedit(parent); + ok(hwndRichedit_EN_LINK != 0, "Failed to create edit window\n"); + + SendMessageA(hwndRichedit_EN_LINK, EM_SETEVENTMASK, 0, ENM_LINK); + + cf2.cbSize = sizeof(CHARFORMAT2A); + cf2.dwMask = CFM_LINK; + cf2.dwEffects = CFE_LINK; + SendMessageA(hwndRichedit_EN_LINK, EM_SETCHARFORMAT, 0, (LPARAM)&cf2); + /* mixing letters and numbers causes runs to be split */ + SendMessageA(hwndRichedit_EN_LINK, WM_SETTEXT, 0, (LPARAM)"link text with at least 2 runs"); + SendMessageA(hwndRichedit_EN_LINK, WM_LBUTTONDOWN, 0, MAKELPARAM(5, 5)); + ok(cpMin_EN_LINK == 0 && cpMax_EN_LINK == 31, "Expected link range [0,31) got [%i,%i)\n", cpMin_EN_LINK, cpMax_EN_LINK); + + DestroyWindow(hwndRichedit_EN_LINK); + DestroyWindow(parent); +} + static void test_undo_coalescing(void) { HWND hwnd; @@ -7565,6 +7621,7 @@ START_TEST( editor ) test_EM_REPLACESEL(1); test_EM_REPLACESEL(0); test_WM_NOTIFY(); + test_EN_LINK(); test_EM_AUTOURLDETECT(); test_eventMask(); test_undo_coalescing();

1 0

Bruno Jesus : winhttp: Use a helper to receive data and take care of EINTR.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: 53f8d78e575b20cacdcfccc304388e12c2f94fe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53f8d78e575b20cacdcfccc30… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Jun 15 21:16:41 2014 -0300 winhttp: Use a helper to receive data and take care of EINTR. --- dlls/winhttp/net.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index c7ff035..b77c706 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -150,6 +150,17 @@ static int sock_send(int fd, const void *msg, size_t len, int flags) return ret; } +static int sock_recv(int fd, void *msg, size_t len, int flags) +{ + int ret; + do + { + ret = recv(fd, msg, len, flags); + } + while(ret == -1 && errno == EINTR); + return ret; +} + static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, WCHAR *server, DWORD security_flags ) { HCERTSTORE store = cert->hCertStore; @@ -453,7 +464,7 @@ BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname ) read_buf_size += 1024; } - size = recv(conn->socket, read_buf+in_bufs[0].cbBuffer, read_buf_size-in_bufs[0].cbBuffer, 0); + size = sock_recv(conn->socket, read_buf+in_bufs[0].cbBuffer, read_buf_size-in_bufs[0].cbBuffer, 0); if(size < 1) { WARN("recv error\n"); status = ERROR_WINHTTP_SECURE_CHANNEL_ERROR; @@ -591,7 +602,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, SIZE_T * heap_free(conn->extra_buf); conn->extra_buf = NULL; }else { - buf_len = recv(conn->socket, conn->ssl_buf+conn->extra_len, ssl_buf_size-conn->extra_len, 0); + buf_len = sock_recv(conn->socket, conn->ssl_buf+conn->extra_len, ssl_buf_size-conn->extra_len, 0); if(buf_len < 0) { WARN("recv failed\n"); return FALSE; @@ -623,7 +634,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, SIZE_T * case SEC_E_INCOMPLETE_MESSAGE: assert(buf_len < ssl_buf_size); - size = recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, 0); + size = sock_recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, 0); if(size < 1) return FALSE; @@ -716,7 +727,7 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd *recvd = size; return TRUE; } - if ((*recvd = recv( conn->socket, buf, len, flags )) == -1) + if ((*recvd = sock_recv( conn->socket, buf, len, flags )) == -1) { set_last_error( sock_get_error( errno ) ); return FALSE;

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: c229428a1489d557de11676e63548547944e7fd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c229428a1489d557de11676e6… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Mon Jun 16 21:18:49 2014 +0300 po: Update Lithuanian translation. --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index ed100dc..77da542 100644 --- a/po/lt.po +++ b/po/lt.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: 2014-05-16 08:19+0300\n" +"PO-Revision-Date: 2014-06-16 21:18+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -6593,10 +6593,8 @@ msgid "This network connection does not exist.\n" msgstr "Šis tinklo ryšys neegzistuoja.\n" #: winerror.mc:3746 -#, fuzzy -#| msgid "Connection refused.\n" msgid "Connection reset by peer.\n" -msgstr "Sujungimas nepriimtas.\n" +msgstr "Sujungimas nutrauktas kito serverio.\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port"

1 0

Marcus Meissner : winealsa/wineoss/winecoreaudio: Calculate frequency in 64bit (Coverity).
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: eddf841ab3846b65acfe18dcba3b337a13f19f30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eddf841ab3846b65acfe18dcb… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jun 17 08:30:42 2014 +0200 winealsa/wineoss/winecoreaudio: Calculate frequency in 64bit (Coverity). --- dlls/winealsa.drv/mmdevdrv.c | 2 +- dlls/winecoreaudio.drv/mmdevdrv.c | 2 +- dlls/wineoss.drv/mmdevdrv.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 5e40d6e..7d41110 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -2823,7 +2823,7 @@ static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) TRACE("(%p)->(%p)\n", This, freq); if(This->share == AUDCLNT_SHAREMODE_SHARED) - *freq = This->fmt->nSamplesPerSec * This->fmt->nBlockAlign; + *freq = (UINT64)This->fmt->nSamplesPerSec * This->fmt->nBlockAlign; else *freq = This->fmt->nSamplesPerSec; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 6603075..81816ca 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -2421,7 +2421,7 @@ static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) TRACE("(%p)->(%p)\n", This, freq); if(This->share == AUDCLNT_SHAREMODE_SHARED) - *freq = This->fmt->nSamplesPerSec * This->fmt->nBlockAlign; + *freq = (UINT64)This->fmt->nSamplesPerSec * This->fmt->nBlockAlign; else *freq = This->fmt->nSamplesPerSec; diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index dd45fba..1e0e116 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -2146,7 +2146,7 @@ static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) TRACE("(%p)->(%p)\n", This, freq); if(This->share == AUDCLNT_SHAREMODE_SHARED) - *freq = This->fmt->nSamplesPerSec * This->fmt->nBlockAlign; + *freq = (UINT64)This->fmt->nSamplesPerSec * This->fmt->nBlockAlign; else *freq = This->fmt->nSamplesPerSec;

1 0

Marcus Meissner : mscms: Removed duplicate return ret (Coverity).
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: 7ce613c3c2fe1d79e1f91ac3ac3a60bf14017a88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ce613c3c2fe1d79e1f91ac3a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jun 17 08:24:56 2014 +0200 mscms: Removed duplicate return ret (Coverity). --- dlls/mscms/profile.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 6759a96..d6ee715 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -355,8 +355,6 @@ BOOL WINAPI GetColorProfileElement( HPROFILE handle, TAGTYPE type, DWORD offset, ret = get_tag_data( profile, type, offset, buffer, size ); *ref = cmsTagLinkedTo( profile->cmsprofile, type ) != 0; release_profile( profile ); - return ret; - #endif /* HAVE_LCMS2 */ return ret; } @@ -1233,8 +1231,6 @@ BOOL WINAPI SetColorProfileElement( HPROFILE handle, TAGTYPE type, DWORD offset, } ret = set_tag_data( profile, type, offset, buffer, size ); release_profile( profile ); - return ret; - #endif /* HAVE_LCMS2 */ return ret; }

1 0

Marcus Meissner : oleaut32: Avoid buffer overread (Coverity).
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: d3d54dfd3c5918c3ce1b892809c968114ab9dc90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3d54dfd3c5918c3ce1b89280… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jun 17 07:43:25 2014 +0200 oleaut32: Avoid buffer overread (Coverity). --- dlls/oleaut32/variant.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index a52c607..addc5a0 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -84,7 +84,7 @@ const char *debugstr_vt(VARTYPE vt) if(vt & ~VT_TYPEMASK) return wine_dbg_sprintf("%s%s", debugstr_vt(vt&VT_TYPEMASK), variant_flags[vt>>12]); - if(vt <= sizeof(variant_types)/sizeof(*variant_types)) + if(vt < sizeof(variant_types)/sizeof(*variant_types)) return variant_types[vt]; if(vt == VT_BSTR_BLOB)

1 0

Francois Gouget : ole32: Fix StorageImpl_LockRegionSync() to actually wait between locking attempts.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: 809b6aeab2c6cfa4ec2a24137f316353fd28f37d URL: http://source.winehq.org/git/wine.git/?a=commit;h=809b6aeab2c6cfa4ec2a24137… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 16 18:23:41 2014 +0200 ole32: Fix StorageImpl_LockRegionSync() to actually wait between locking attempts. --- dlls/ole32/storage32.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 757138d..f425d87 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2874,6 +2874,7 @@ static HRESULT StorageImpl_LockRegionSync(StorageImpl *This, ULARGE_INTEGER offs ULARGE_INTEGER cb, DWORD dwLockType) { HRESULT hr; + int delay = 0; /* if it's a FileLockBytesImpl use LockFileEx in blocking mode */ if (SUCCEEDED(FileLockBytesImpl_LockRegionSync(This->lockBytes, offset, cb))) @@ -2882,8 +2883,6 @@ static HRESULT StorageImpl_LockRegionSync(StorageImpl *This, ULARGE_INTEGER offs /* otherwise we have to fake it based on an async lock */ do { - int delay=0; - hr = ILockBytes_LockRegion(This->lockBytes, offset, cb, dwLockType); if (hr == STG_E_ACCESSDENIED)

1 0

Bruno Jesus : winhttp: Use a helper to send data and take care of EINTR.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: 6db935a6f45391c82437c0892a077b30338f5e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6db935a6f45391c82437c0892… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Jun 15 21:16:25 2014 -0300 winhttp: Use a helper to send data and take care of EINTR. --- dlls/winhttp/net.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index b751bf0..c7ff035 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -139,6 +139,17 @@ static int sock_get_error( int err ) return err; } +static int sock_send(int fd, const void *msg, size_t len, int flags) +{ + int ret; + do + { + ret = send(fd, msg, len, flags); + } + while(ret == -1 && errno == EINTR); + return ret; +} + static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, WCHAR *server, DWORD security_flags ) { HCERTSTORE store = cert->hCertStore; @@ -403,7 +414,7 @@ BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname ) TRACE("sending %u bytes\n", out_buf.cbBuffer); - size = send(conn->socket, out_buf.pvBuffer, out_buf.cbBuffer, 0); + size = sock_send(conn->socket, out_buf.pvBuffer, out_buf.cbBuffer, 0); if(size != out_buf.cbBuffer) { ERR("send failed\n"); res = ERROR_WINHTTP_SECURE_CHANNEL_ERROR; @@ -524,7 +535,7 @@ static BOOL send_ssl_chunk(netconn_t *conn, const void *msg, size_t size) return FALSE; } - if(send(conn->socket, conn->ssl_buf, bufs[0].cbBuffer+bufs[1].cbBuffer+bufs[2].cbBuffer, 0) < 1) { + if(sock_send(conn->socket, conn->ssl_buf, bufs[0].cbBuffer+bufs[1].cbBuffer+bufs[2].cbBuffer, 0) < 1) { WARN("send failed\n"); return FALSE; } @@ -554,7 +565,7 @@ BOOL netconn_send( netconn_t *conn, const void *msg, size_t len, int *sent ) return TRUE; } - if ((*sent = send( conn->socket, msg, len, 0 )) == -1) + if ((*sent = sock_send( conn->socket, msg, len, 0 )) == -1) { set_last_error( sock_get_error( errno ) ); return FALSE;

1 0

Sebastian Lackner : kernel32: Update VirtualAddress of resource section in write_raw_resources.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: 270d66efc74c11d86ea1c62d289c825a225b1f37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=270d66efc74c11d86ea1c62d2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jun 15 23:38:38 2014 +0200 kernel32: Update VirtualAddress of resource section in write_raw_resources. --- dlls/kernel32/resource.c | 1 + dlls/kernel32/tests/resource.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index e829f28..ecd599f 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -1554,6 +1554,7 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) sec->SizeOfRawData = section_size; sec->Misc.VirtualSize = virtual_section_size; nt->OptionalHeader.SizeOfImage += rva_delta; + nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = sec->VirtualAddress; nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].Size = res_size.total_size; nt->OptionalHeader.SizeOfInitializedData = get_init_data_size( write_map->base, mapping_size ); } diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c index f94fed6..43551fa 100644 --- a/dlls/kernel32/tests/resource.c +++ b/dlls/kernel32/tests/resource.c @@ -394,6 +394,7 @@ static void check_exe( const sec_verify *verify ) int i; IMAGE_DOS_HEADER *dos; IMAGE_NT_HEADERS *nt; + IMAGE_OPTIONAL_HEADER *opt; IMAGE_SECTION_HEADER *sec; IMAGE_RESOURCE_DIRECTORY *dir; HANDLE file, mapping; @@ -415,6 +416,7 @@ static void check_exe( const sec_verify *verify ) goto end; nt = (void*) ((BYTE*) dos + dos->e_lfanew); + opt = &nt->OptionalHeader; sec = (void*) &nt[1]; for(i = 0; i < max_sections; i++) @@ -444,6 +446,10 @@ static void check_exe( const sec_verify *verify ) verify->NumberOfNamedEntries, dir->NumberOfNamedEntries); ok( dir->NumberOfIdEntries == verify->NumberOfIdEntries, "NumberOfIdEntries should be %d instead of %d\n", verify->NumberOfIdEntries, dir->NumberOfIdEntries); + + ok(opt->DataDirectory[IMAGE_FILE_RESOURCE_DIRECTORY].VirtualAddress == sec[verify->rsrc_section].VirtualAddress, + "VirtualAddress in optional header should be %d instead of %d\n", + sec[verify->rsrc_section].VirtualAddress, opt->DataDirectory[IMAGE_FILE_RESOURCE_DIRECTORY].VirtualAddress); } end:

1 0

Francois Gouget : testbot/lib: Add a utility function to atomically create a new directory.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: tools Branch: master Commit: 50f0f9de34bf23fcb256ad32dcf3abbdcf097bec URL: http://source.winehq.org/git/tools.git/?a=commit;h=50f0f9de34bf23fcb256ad32… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 16 16:11:25 2014 +0200 testbot/lib: Add a utility function to atomically create a new directory. It ensures there are no race conditions with other processes and simplifies the calling code. --- testbot/bin/Engine.pl | 14 ++------------ testbot/lib/WineTestBot/Utils.pm | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 29dc919..75a8851 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -412,12 +412,7 @@ sub HandleWinePatchMLSubmission() my $FullMessageFileName = "$DataDir/staging/$1"; # Create a work directory - my $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; - while (-e $WorkDir) - { - $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; - } - mkdir $WorkDir; + my $WorkDir = CreateNewDir("$DataDir/staging", "_work"); # Process the patch my $Parser = new MIME::Parser; @@ -489,12 +484,7 @@ sub HandleWinePatchWebSubmission() foreach my $WebPatchId (sort { $a <=> $b } @WebPatchIds) { # Create a working dir - my $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; - while (-e $WorkDir) - { - $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; - } - mkdir $WorkDir; + my $WorkDir = CreateNewDir("$DataDir/staging", "_work"); # Process the patch my $Parser = new MIME::Parser; diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 1cea5d7..743e5ee 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -33,7 +33,8 @@ use vars qw (@ISA @EXPORT); require Exporter; @ISA = qw(Exporter); @EXPORT = qw(&MakeSecureURL &SecureConnection &GenerateRandomString - &OpenNewFile &CreateNewFile &CreateNewLink &BuildEMailRecipient); + &OpenNewFile &CreateNewFile &CreateNewLink &CreateNewDir + &BuildEMailRecipient); sub MakeSecureURL($) { @@ -105,6 +106,20 @@ sub CreateNewLink($$$) } } +sub CreateNewDir($$) +{ + my ($Dir, $Suffix) = @_; + + while (1) + { + my $Path = "$Dir/" . GenerateRandomString(32) . $Suffix; + return $Path if (mkdir $Path); + + # This is not an error that will be fixed by trying a different path + return undef if (!$!{EEXIST}); + } +} + sub DateTimeToString($) { my ($Time) = @_;

1 0