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

André Hentschel : winecfg: Improve German About dialog .
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 90586893c167b157bf76cce5bfa37ea3514e5d84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90586893c167b157bf76cce5b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jul 6 18:49:21 2009 +0200 winecfg: Improve German About dialog. --- programs/winecfg/De.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index 1bedd06..019b49b 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -42,11 +42,11 @@ BEGIN LTEXT "http://www.winehq.org/",IDC_STATIC,119,31,106,8 LTEXT "Diese Bibliothek ist freie Software; Sie d�rfen sie unter den Bedingungen der GNU Lesser General Public License, wie von der Free Software Foundation ver�ffentlicht, weiterverteilen und/oder modifizieren; entweder gem�� Version 2.1 der Lizenz oder (nach Ihrer Option) jeder sp�teren Version.", IDC_STATIC,119,44,124,72 - GROUPBOX " Windows-Registrierungs-Informationen ", IDC_STATIC, 15, 110, 230, 55 - LTEXT "&Eigent�mer:", IDC_STATIC, 22, 126, 40, 20 - EDITTEXT IDC_ABT_OWNER, 75, 126, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP - LTEXT "&Organisation:", IDC_STATIC, 22, 140, 50, 20 - EDITTEXT IDC_ABT_ORG, 75, 140, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP + GROUPBOX " Windows-Registrierungs-Informationen ", IDC_STATIC, 15, 120, 230, 55 + LTEXT "&Eigent�mer:", IDC_STATIC, 22, 136, 40, 20 + EDITTEXT IDC_ABT_OWNER, 75, 136, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP + LTEXT "&Organisation:", IDC_STATIC, 22, 150, 50, 20 + EDITTEXT IDC_ABT_ORG, 75, 150, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP END IDD_APPCFG DIALOG DISCARDABLE 0, 0, 260, 250

1 0

Anders Jonsson : notepad: Update Swedish translation.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 1903e74c687761fb7cd70d5d29fbcb1c9e7ad2eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1903e74c687761fb7cd70d5d2… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Mon Jul 6 17:13:42 2009 +0200 notepad: Update Swedish translation. --- programs/notepad/Sv.rc | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Sv.rc b/programs/notepad/Sv.rc index f2893b0..75d0e59 100644 --- a/programs/notepad/Sv.rc +++ b/programs/notepad/Sv.rc @@ -94,6 +94,14 @@ PUSHBUTTON "Avbryt", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP PUSHBUTTON "&Hj�lp", IDHELP, 180, 39, 40, 15, WS_TABSTOP } +IDD_OFN_TEMPLATE DIALOG DISCARDABLE 50,50,300,15 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Kodning:", -1, 5,0, 50,12 + COMBOBOX IDC_OFN_ENCCOMBO, 53,0, 156,48, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST +END + STRINGTABLE DISCARDABLE { STRING_PAGESETUP_HEADERVALUE, "&f" @@ -122,4 +130,13 @@ STRING_OUT_OF_MEMORY, "Det finns inte tillr den h�r uppgiften.\nAvsluta ett eller flera program f�r att �ka m�ngden\nledigt \ minne." +STRING_UNICODE_LE, "Unicode (UTF-16)" +STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" + +STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ +Denna fil inneh�ller Unicode-tecken vilka kommer att g� \n\ +f�rlorade om du sparar filen under kodningen %s. \n\ +Klicka Avbryt och v�lj sedan ett av Unicode-alternativen \n\ +i teckenkodningslistan f�r att beh�lla dessa tecken. \n\ +Vill du forts�tta?" }

1 0

Paul Chitescu : crypt32: Updated Romanian translation.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: a852de9daf7966b7223ccee269fc1156fbf4481c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a852de9daf7966b7223ccee26… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Mon Jul 6 21:03:27 2009 +0300 crypt32: Updated Romanian translation. --- dlls/crypt32/crypt32_Ro.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32_Ro.rc b/dlls/crypt32/crypt32_Ro.rc index 65d1c1e..10e33ea 100644 --- a/dlls/crypt32/crypt32_Ro.rc +++ b/dlls/crypt32/crypt32_Ro.rc @@ -177,6 +177,7 @@ STRINGTABLE DISCARDABLE IDS_LOCALIZEDNAME_CA "Autorități intermediare de certificare" IDS_LOCALIZEDNAME_ADDRESSBOOK "Alte persoane" IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "Editor de încredere" + IDS_LOCALIZEDNAME_DISALLOWED "Lipsite de încredere" } STRINGTABLE DISCARDABLE

1 0

Ricardo Filipe : comdlg32: Update Portuguese translation and convert to UTF8.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 003c8dadf21dc6d6449f920e491a6c292a611b15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=003c8dadf21dc6d6449f920e4… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Mon Jul 6 12:20:51 2009 -0700 comdlg32: Update Portuguese translation and convert to UTF8. --- dlls/comdlg32/cdlg_Pt.rc | 284 ++++++++++++++++++++++++---------------------- 1 files changed, 148 insertions(+), 136 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=003c8dadf21dc6d6449f9…

1 0

Ricardo Filipe : oledlg: Update Portuguese translation and convert to UTF8.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 137582a9dbaab53fab9f1eee2d015e3235eec83f URL: http://source.winehq.org/git/wine.git/?a=commit;h=137582a9dbaab53fab9f1eee2… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Mon Jul 6 12:59:09 2009 -0700 oledlg: Update Portuguese translation and convert to UTF8. --- dlls/oledlg/oledlg_Pt.rc | 57 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 50 insertions(+), 7 deletions(-) diff --git a/dlls/oledlg/oledlg_Pt.rc b/dlls/oledlg/oledlg_Pt.rc index 1ab7a02..078d2c1 100644 --- a/dlls/oledlg/oledlg_Pt.rc +++ b/dlls/oledlg/oledlg_Pt.rc @@ -1,6 +1,7 @@ /* * Copyright 2004 Marcelo Duarte - * Copyright 2006 Am�rico Jos� Melo + * Copyright 2006 Américo José Melo + * Copyright 2009 Ricardo Filipe * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,6 +20,8 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 @@ -41,7 +44,7 @@ BEGIN BS_AUTORADIOBUTTON,7,37,67,10 LTEXT "",IDC_RESULTDESC,49,112,159,23 PUSHBUTTON "&Adicionar Controle...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "Mostrar como �cone",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + CONTROL "Mostrar como ícone",IDC_ASICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 PUSHBUTTON "Procurar...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE LTEXT "Arquivo:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE @@ -70,7 +73,7 @@ BEGIN BS_AUTORADIOBUTTON,7,37,67,10 LTEXT "",IDC_RESULTDESC,49,112,159,23 PUSHBUTTON "&Adicionar Controlo...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "Mostrar como �cone",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + CONTROL "Mostrar como ícone",IDC_ASICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 PUSHBUTTON "Procurar...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE LTEXT "Ficheiro:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE @@ -83,9 +86,9 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE DISCARDABLE { IDS_RESULTOBJDESC "Inserir um novo objeto %s no documento" - IDS_RESULTFILEOBJDESC "Inserir o conte�do do arquivo como um objeto no documento de modo que possa ativ�-lo usando o programa que o criou." + IDS_RESULTFILEOBJDESC "Inserir o conteúdo do arquivo como um objeto no documento de modo que possa ativá-lo usando o programa que o criou." IDS_BROWSE "Procurar" - IDS_NOTOLEMOD "O arquivo n�o parece ser um m�dulo OLE v�lido. Imposs�vel registrar o controle OLE." + IDS_NOTOLEMOD "O arquivo não parece ser um módulo OLE válido. Impossível registrar o controle OLE." IDS_NOTOLEMODCAPTION "Adicionar Controle" } @@ -94,8 +97,48 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE STRINGTABLE DISCARDABLE { IDS_RESULTOBJDESC "Inserir novo objecto %s no documento" - IDS_RESULTFILEOBJDESC "Inserir conte�do do ficheiro como um objecto no documento de modo que opossa activar usando o programa que o criou." + IDS_RESULTFILEOBJDESC "Inserir conteúdo do ficheiro como um objecto no documento de modo que opossa activar usando o programa que o criou." IDS_BROWSE "Procurar" - IDS_NOTOLEMOD "O ficheiro n�o parece ser um m�dulo OLE v�lido. Imposs�vel registrar o controlo OLE." + IDS_NOTOLEMOD "O ficheiro não parece ser um módulo OLE válido. Impossível registrar o controlo OLE." IDS_NOTOLEMODCAPTION "Adicionar Controlo" } + +IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Colar Especial" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Origem:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP + CONTROL "&Colar", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, + 6, 38, 55, 10 + CONTROL "Colar &Ligação", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + 6, 63, 55, 10 + LTEXT "&Como:", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP + LISTBOX IDC_PS_PASTELIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_PASTELINKLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_DISPLAYLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE + CONTROL "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14 + CONTROL "Cancelar", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14 + CONTROL "&Ajuda", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 + CONTROL "&Mostrar como Icone", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14 + CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44 + CONTROL "Mudar &Icone...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 + CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 + CONTROL "<< texto resultante fica aqui >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 + CONTROL "Resultado", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 + CONTROL "", IDC_PS_SOURCETEXT, "Editar", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PS_PASTE_DATA "Insere o conteúdo da área de transferência no seu documento como %s." + IDS_PS_PASTE_OBJECT "Insere o conteúdo da área de transferência no seu documento para que o possa activar usando %s." + IDS_PS_PASTE_OBJECT_AS_ICON "Insere o conteúdo da área de transferência no seu documento para que o possa activar usando %s. Vai ser mostrado como um icone." + IDS_PS_PASTE_LINK_DATA "Insere o conteúdo da área de transferência no seu documento como %s. Os dados estão ligados ao ficheiro de origem para que alterações ao ficheiro se reflictam no seu documento." + IDS_PS_PASTE_LINK_OBJECT "Insere uma imagem da área de transferência no seu documento. A imagem fica ligada ao ficheiro de origem para que alterações ao ficheiro se reflictam no seu documento." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Insere um atalho que aponta para a localização do conteúdo na área de transferência. O atalho fica ligado ao ficheiro de origem para que alterações ao ficheiro se reflictam no seu documento." + IDS_PS_NON_OLE "Insere o conteúdo da área de transferência no seu documento." + IDS_PS_UNKNOWN_TYPE "Tipo Desconhecido" + IDS_PS_UNKNOWN_SRC "Origem Desconhecida" + IDS_PS_UNKNOWN_APP "o programa que o criou" +}

1 0

Damjan Jovanovic : ws2_32: Test AcceptEx short reads.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 0066319b2dca4dd5041cd5bf714a64faf458cf3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0066319b2dca4dd5041cd5bf7… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Jul 6 20:29:35 2009 +0200 ws2_32: Test AcceptEx short reads. --- dlls/ws2_32/tests/sock.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 1eab132..b667008 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2656,6 +2656,44 @@ static void test_AcceptEx(void) ok(bret, "GetOverlappedResult failed, error %d\n", GetLastError()); ok(bytesReturned == 0, "bytesReturned isn't supposed to be %d\n", bytesReturned); + closesocket(connector); + connector = INVALID_SOCKET; + closesocket(acceptor); + acceptor = INVALID_SOCKET; + + /* Test short reads */ + + acceptor = socket(AF_INET, SOCK_STREAM, 0); + if (acceptor == INVALID_SOCKET) { + skip("could not create acceptor socket, error %d\n", WSAGetLastError()); + goto end; + } + connector = socket(AF_INET, SOCK_STREAM, 0); + if (connector == INVALID_SOCKET) { + skip("could not create connector socket, error %d\n", WSAGetLastError()); + goto end; + } + bret = pAcceptEx(listener, acceptor, buffer, 2, + sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, + &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); + + iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + ok(iret == 0, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); + + dwret = WaitForSingleObject(overlapped.hEvent, 0); + ok(dwret == WAIT_TIMEOUT, "Waiting for accept event timeout failed with %d + errno %d\n", dwret, GetLastError()); + + iret = send(connector, buffer, 1, 0); + ok(iret == 1, "could not send 1 byte: send %d errno %d\n", iret, WSAGetLastError()); + + dwret = WaitForSingleObject(overlapped.hEvent, 0); + ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); + + bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE); + ok(bret, "GetOverlappedResult failed, error %d\n", GetLastError()); + ok(bytesReturned == 1, "bytesReturned isn't supposed to be %d\n", bytesReturned); + end: if (overlapped.hEvent) WSACloseEvent(overlapped.hEvent);

1 0

Rein Klazes : comdlg32: Rearrange some more controls when resizing a file dialog.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: c23ccc03d98c73bfc24d1754a30977ce6556e545 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c23ccc03d98c73bfc24d1754a… Author: Rein Klazes <wijn(a)online.nl> Date: Tue Jul 7 08:11:55 2009 +0200 comdlg32: Rearrange some more controls when resizing a file dialog. --- dlls/comdlg32/filedlg.c | 65 ++++++++++++++++--- dlls/comdlg32/tests/filedlg.c | 139 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 182 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c23ccc03d98c73bfc24d1…

1 0

Hans Leidekker : iphlpapi: Use a separate index to count addresses in GetAdaptersAddresses.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: cd1ed081def59bc912dab9a378d7eacd90396fea URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd1ed081def59bc912dab9a37… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 7 10:12:56 2009 +0200 iphlpapi: Use a separate index to count addresses in GetAdaptersAddresses. Fixes address enumeration when an interfaces is not configured with an IP address or when an interface is configured with more than one address. --- dlls/iphlpapi/iphlpapi_main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 8490c67..16cf1b3 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -611,7 +611,7 @@ static DWORD typeFromMibType(DWORD mib_type) static ULONG addressesFromIndex(DWORD index, DWORD **addrs, ULONG *num_addrs) { - ULONG ret, i; + ULONG ret, i, j; MIB_IPADDRTABLE *at; *num_addrs = 0; @@ -625,9 +625,9 @@ static ULONG addressesFromIndex(DWORD index, DWORD **addrs, ULONG *num_addrs) HeapFree(GetProcessHeap(), 0, at); return ERROR_OUTOFMEMORY; } - for (i = 0; i < at->dwNumEntries; i++) + for (i = 0, j = 0; i < at->dwNumEntries; i++) { - if (at->table[i].dwIndex == index) (*addrs)[i] = at->table[i].dwAddr; + if (at->table[i].dwIndex == index) (*addrs)[j++] = at->table[i].dwAddr; } HeapFree(GetProcessHeap(), 0, at); return ERROR_SUCCESS;

1 0

Hans Leidekker : winhttp: Implement WinHttpSetTimeouts.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 9d9c505a273edbb79ce7dc60a324d2bbf6a2bdab URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d9c505a273edbb79ce7dc60a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 7 10:14:11 2009 +0200 winhttp: Implement WinHttpSetTimeouts. --- dlls/winhttp/session.c | 36 ++++++++++++++++++++++++++++++++++-- dlls/winhttp/winhttp_private.h | 1 + 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 11c4b4f..55f9779 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -737,8 +737,40 @@ WINHTTP_STATUS_CALLBACK WINAPI WinHttpSetStatusCallback( HINTERNET handle, WINHT */ BOOL WINAPI WinHttpSetTimeouts( HINTERNET handle, int resolve, int connect, int send, int receive ) { - FIXME("%p, %d, %d, %d, %d\n", handle, resolve, connect, send, receive); - return TRUE; + BOOL ret = TRUE; + request_t *request; + + TRACE("%p, %d, %d, %d, %d\n", handle, resolve, connect, send, receive); + + if (resolve < -1 || connect < -1 || send < -1 || receive < -1) + { + set_last_error( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + FIXME("resolve and connect timeout not supported\n"); + + if (!(request = (request_t *)grab_object( handle ))) + { + set_last_error( ERROR_INVALID_HANDLE ); + return FALSE; + } + + if (request->hdr.type != WINHTTP_HANDLE_TYPE_REQUEST) + { + release_object( &request->hdr ); + set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); + return FALSE; + } + + if (send < 0) send = 0; + if (netconn_set_timeout( &request->netconn, TRUE, send )) ret = FALSE; + + if (receive < 0) receive = 0; + if (netconn_set_timeout( &request->netconn, FALSE, receive )) ret = FALSE; + + release_object( &request->hdr ); + return ret; } static const WCHAR wkday[7][4] = diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 511e124..823d0ae 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -214,6 +214,7 @@ BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ); BOOL netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr_in * ); BOOL netconn_secure_connect( netconn_t * ); BOOL netconn_send( netconn_t *, const void *, size_t, int, int * ); +DWORD netconn_set_timeout( netconn_t *, BOOL, int ); const void *netconn_get_certificate( netconn_t * ); BOOL set_cookies( request_t *, const WCHAR * );

1 0

Alexandre Julliard : winetest: Load resources by name instead of id.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: fc2bef1d9cd1f50db5328f75849a46ae080c98ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc2bef1d9cd1f50db5328f758… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 7 10:59:29 2009 +0200 winetest: Load resources by name instead of id. --- programs/winetest/main.c | 18 ++++++++---------- programs/winetest/resource.h | 9 --------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 66daa65..887fbfa 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -284,13 +284,13 @@ static const char* get_test_source_file(const char* test, const char* subtest) return buffer; } -static void* extract_rcdata (LPTSTR name, int type, DWORD* size) +static void* extract_rcdata (LPCTSTR name, LPCTSTR type, DWORD* size) { HRSRC rsrc; HGLOBAL hdl; LPVOID addr; - if (!(rsrc = FindResource (NULL, name, MAKEINTRESOURCE(type))) || + if (!(rsrc = FindResource (NULL, name, type)) || !(*size = SizeofResource (0, rsrc)) || !(hdl = LoadResource (0, rsrc)) || !(addr = LockResource (hdl))) @@ -308,7 +308,7 @@ extract_test (struct wine_test *test, const char *dir, LPTSTR res_name) HANDLE hfile; DWORD written; - code = extract_rcdata (res_name, TESTRES, &size); + code = extract_rcdata (res_name, "TESTRES", &size); if (!code) report (R_FATAL, "Can't find test resource %s: %d", res_name, GetLastError ()); test->name = heap_strdup( res_name ); @@ -682,7 +682,7 @@ run_tests (char *logname, char *outdir) xprintf ("Archive: -\n"); /* no longer used */ xprintf ("Tag: %s\n", tag); xprintf ("Build info:\n"); - strres = extract_rcdata (MAKEINTRESOURCE(BUILD_INFO), STRINGRES, &strsize); + strres = extract_rcdata ("BUILD_INFO", "STRINGRES", &strsize); while (strres) { eol = memchr (strres, '\n', strsize); if (!eol) { @@ -701,8 +701,7 @@ run_tests (char *logname, char *outdir) xprintf ("Dll info:\n" ); report (R_STATUS, "Counting tests"); - if (!EnumResourceNames (NULL, MAKEINTRESOURCE(TESTRES), - EnumTestFileProc, (LPARAM)&nr_of_files)) + if (!EnumResourceNames (NULL, "TESTRES", EnumTestFileProc, (LPARAM)&nr_of_files)) report (R_FATAL, "Can't enumerate test files: %d", GetLastError ()); wine_tests = heap_alloc (nr_of_files * sizeof wine_tests[0]); @@ -717,8 +716,7 @@ run_tests (char *logname, char *outdir) report (R_PROGRESS, 0, nr_of_files); nr_of_files = 0; nr_of_tests = 0; - if (!EnumResourceNames (NULL, MAKEINTRESOURCE(TESTRES), - extract_test_proc, (LPARAM)tempdir)) + if (!EnumResourceNames (NULL, "TESTRES", extract_test_proc, (LPARAM)tempdir)) report (R_FATAL, "Can't enumerate test files: %d", GetLastError ()); @@ -801,7 +799,7 @@ static void extract_only (const char *target_dir) nr_of_files = 0; report (R_STATUS, "Counting tests"); - if (!EnumResourceNames (NULL, MAKEINTRESOURCE(TESTRES), EnumTestFileProc, (LPARAM)&nr_of_files)) + if (!EnumResourceNames (NULL, "TESTRES", EnumTestFileProc, (LPARAM)&nr_of_files)) report (R_FATAL, "Can't enumerate test files: %d", GetLastError ()); wine_tests = heap_alloc (nr_of_files * sizeof wine_tests[0] ); @@ -809,7 +807,7 @@ static void extract_only (const char *target_dir) report (R_STATUS, "Extracting tests"); report (R_PROGRESS, 0, nr_of_files); nr_of_files = 0; - if (!EnumResourceNames (NULL, MAKEINTRESOURCE(TESTRES), extract_only_proc, (LPARAM)target_dir)) + if (!EnumResourceNames (NULL, "TESTRES", extract_only_proc, (LPARAM)target_dir)) report (R_FATAL, "Can't enumerate test files: %d", GetLastError ()); report (R_DELTA, 0, "Extracting: Done"); diff --git a/programs/winetest/resource.h b/programs/winetest/resource.h index 6676508..b0f1646 100644 --- a/programs/winetest/resource.h +++ b/programs/winetest/resource.h @@ -43,12 +43,3 @@ #define IDC_ABOUT 4001 #define IDS_BUILD_ID 1 - -/* Resource types */ - -#define TESTRES 1000 -#define STRINGRES 1001 - -/* String resources */ - -#define BUILD_INFO 10001

1 0