wine-commits November 2011

wine-commits@winehq.org

2 participants
852 discussions

Michael Stefaniuc : include: Drop "l" modifiers from numeric constants in winternl.h.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 5337ad066f3d09f86ee88c120d87080c96e3d902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5337ad066f3d09f86ee88c120… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Nov 10 01:39:59 2011 +0100 include: Drop "l" modifiers from numeric constants in winternl.h. --- include/winternl.h | 78 ++++++++++++++++++++++++++-------------------------- 1 files changed, 39 insertions(+), 39 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index cba5171..d8dd177 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1604,14 +1604,14 @@ typedef struct _RTL_HANDLE_TABLE #define LOGONID_CURRENT ((ULONG)-1) -#define OBJ_INHERIT 0x00000002L -#define OBJ_PERMANENT 0x00000010L -#define OBJ_EXCLUSIVE 0x00000020L -#define OBJ_CASE_INSENSITIVE 0x00000040L -#define OBJ_OPENIF 0x00000080L -#define OBJ_OPENLINK 0x00000100L -#define OBJ_KERNEL_HANDLE 0x00000200L -#define OBJ_VALID_ATTRIBUTES 0x000003F2L +#define OBJ_INHERIT 0x00000002 +#define OBJ_PERMANENT 0x00000010 +#define OBJ_EXCLUSIVE 0x00000020 +#define OBJ_CASE_INSENSITIVE 0x00000040 +#define OBJ_OPENIF 0x00000080 +#define OBJ_OPENLINK 0x00000100 +#define OBJ_KERNEL_HANDLE 0x00000200 +#define OBJ_VALID_ATTRIBUTES 0x000003F2 #define SERVERNAME_CURRENT ((HANDLE)NULL) @@ -1629,37 +1629,37 @@ typedef void (NTAPI *RTL_WAITORTIMERCALLBACKFUNC)(PVOID,BOOLEAN); /* FIXME: not #define DPFLTR_MASK 0x8000000 /* Well-known LUID values */ -#define SE_MIN_WELL_KNOWN_PRIVILEGE 2L -#define SE_CREATE_TOKEN_PRIVILEGE 2L -#define SE_ASSIGNPRIMARYTOKEN_PRIVILEGE 3L -#define SE_LOCK_MEMORY_PRIVILEGE 4L -#define SE_INCREASE_QUOTA_PRIVILEGE 5L -#define SE_UNSOLICITED_INPUT_PRIVILEGE 6L /* obsolete */ -#define SE_MACHINE_ACCOUNT_PRIVILEGE 6L -#define SE_TCB_PRIVILEGE 7L -#define SE_SECURITY_PRIVILEGE 8L -#define SE_TAKE_OWNERSHIP_PRIVILEGE 9L -#define SE_LOAD_DRIVER_PRIVILEGE 10L -#define SE_SYSTEM_PROFILE_PRIVILEGE 11L -#define SE_SYSTEMTIME_PRIVILEGE 12L -#define SE_PROF_SINGLE_PROCESS_PRIVILEGE 13L -#define SE_INC_BASE_PRIORITY_PRIVILEGE 14L -#define SE_CREATE_PAGEFILE_PRIVILEGE 15L -#define SE_CREATE_PERMANENT_PRIVILEGE 16L -#define SE_BACKUP_PRIVILEGE 17L -#define SE_RESTORE_PRIVILEGE 18L -#define SE_SHUTDOWN_PRIVILEGE 19L -#define SE_DEBUG_PRIVILEGE 20L -#define SE_AUDIT_PRIVILEGE 21L -#define SE_SYSTEM_ENVIRONMENT_PRIVILEGE 22L -#define SE_CHANGE_NOTIFY_PRIVILEGE 23L -#define SE_REMOTE_SHUTDOWN_PRIVILEGE 24L -#define SE_UNDOCK_PRIVILEGE 25L -#define SE_SYNC_AGENT_PRIVILEGE 26L -#define SE_ENABLE_DELEGATION_PRIVILEGE 27L -#define SE_MANAGE_VOLUME_PRIVILEGE 28L -#define SE_IMPERSONATE_PRIVILEGE 29L -#define SE_CREATE_GLOBAL_PRIVILEGE 30L +#define SE_MIN_WELL_KNOWN_PRIVILEGE 2 +#define SE_CREATE_TOKEN_PRIVILEGE 2 +#define SE_ASSIGNPRIMARYTOKEN_PRIVILEGE 3 +#define SE_LOCK_MEMORY_PRIVILEGE 4 +#define SE_INCREASE_QUOTA_PRIVILEGE 5 +#define SE_UNSOLICITED_INPUT_PRIVILEGE 6 /* obsolete */ +#define SE_MACHINE_ACCOUNT_PRIVILEGE 6 +#define SE_TCB_PRIVILEGE 7 +#define SE_SECURITY_PRIVILEGE 8 +#define SE_TAKE_OWNERSHIP_PRIVILEGE 9 +#define SE_LOAD_DRIVER_PRIVILEGE 10 +#define SE_SYSTEM_PROFILE_PRIVILEGE 11 +#define SE_SYSTEMTIME_PRIVILEGE 12 +#define SE_PROF_SINGLE_PROCESS_PRIVILEGE 13 +#define SE_INC_BASE_PRIORITY_PRIVILEGE 14 +#define SE_CREATE_PAGEFILE_PRIVILEGE 15 +#define SE_CREATE_PERMANENT_PRIVILEGE 16 +#define SE_BACKUP_PRIVILEGE 17 +#define SE_RESTORE_PRIVILEGE 18 +#define SE_SHUTDOWN_PRIVILEGE 19 +#define SE_DEBUG_PRIVILEGE 20 +#define SE_AUDIT_PRIVILEGE 21 +#define SE_SYSTEM_ENVIRONMENT_PRIVILEGE 22 +#define SE_CHANGE_NOTIFY_PRIVILEGE 23 +#define SE_REMOTE_SHUTDOWN_PRIVILEGE 24 +#define SE_UNDOCK_PRIVILEGE 25 +#define SE_SYNC_AGENT_PRIVILEGE 26 +#define SE_ENABLE_DELEGATION_PRIVILEGE 27 +#define SE_MANAGE_VOLUME_PRIVILEGE 28 +#define SE_IMPERSONATE_PRIVILEGE 29 +#define SE_CREATE_GLOBAL_PRIVILEGE 30 #define SE_MAX_WELL_KNOWN_PRIVILEGE SE_CREATE_GLOBAL_PRIVILEGE /* NtGlobalFlag bits */

1 0

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: ccf369ad0897e8308cd97d04f121614826bcd0da URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccf369ad0897e8308cd97d04f… Author: Luca Bennati <lucak3(a)gmail.com> Date: Wed Nov 9 10:27:50 2011 +0100 po: Update Italian translation. --- po/it.po | 74 ++++++++++++++++++++++++++++++------------------------------- 1 files changed, 36 insertions(+), 38 deletions(-) diff --git a/po/it.po b/po/it.po index 50ab75e..c4b752b 100644 --- a/po/it.po +++ b/po/it.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: 2011-10-31 19:18+0100\n" +"PO-Revision-Date: 2011-11-09 10:22+0100\n" "Last-Translator: Luca Bennati <lucak3(a)gmail.com>\n" "Language-Team: none\n" "Language: Italian\n" @@ -246,7 +246,7 @@ msgstr "Dettagli" #: comdlg32.rc:59 msgid "Browse to Desktop" -msgstr "Vai al desktop" +msgstr "Vai alla Scrivania" #: comdlg32.rc:123 msgid "Regular" @@ -1010,7 +1010,7 @@ msgstr "Ottieni CRL" #: crypt32.rc:132 msgid "Revoke Request" -msgstr "Revoca richiesta" +msgstr "Richiesta di revoca" #: crypt32.rc:133 msgid "Query Pending" @@ -2040,73 +2040,71 @@ msgstr "%uMB usati, %uMB disponibili" #: gdi32.rc:25 msgid "Western" -msgstr "" +msgstr "Ovest" #: gdi32.rc:26 msgid "Central European" -msgstr "" +msgstr "Europeo centrale" #: gdi32.rc:27 msgid "Cyrillic" -msgstr "" +msgstr "Cirillico" #: gdi32.rc:28 -#, fuzzy msgid "Greek" -msgstr "Verde" +msgstr "Greco" #: gdi32.rc:29 msgid "Turkish" -msgstr "" +msgstr "Turco" #: gdi32.rc:30 msgid "Hebrew" -msgstr "" +msgstr "Ebreo" #: gdi32.rc:31 msgid "Arabic" -msgstr "" +msgstr "Arabo" #: gdi32.rc:32 msgid "Baltic" -msgstr "" +msgstr "Baltico" #: gdi32.rc:33 msgid "Vietnamese" -msgstr "" +msgstr "Vietnamita" #: gdi32.rc:34 msgid "Thai" -msgstr "" +msgstr "Thai" #: gdi32.rc:35 -#, fuzzy msgid "Japanese" -msgstr "pannello" +msgstr "Giapponese" #: gdi32.rc:36 msgid "CHINESE_GB2312" -msgstr "" +msgstr "CHINESE_GB2312" #: gdi32.rc:37 msgid "Hangul" -msgstr "" +msgstr "Hangul" #: gdi32.rc:38 msgid "CHINESE_BIG5" -msgstr "" +msgstr "CHINESE_BIG5" #: gdi32.rc:39 msgid "Hangul(Johab)" -msgstr "" +msgstr "Hangul (Johab)" #: gdi32.rc:40 msgid "Symbol" -msgstr "" +msgstr "Symbol" #: gdi32.rc:41 msgid "OEM/DOS" -msgstr "" +msgstr "OEM/DOS" #: hhctrl.rc:56 msgid "S&ync" @@ -2284,7 +2282,7 @@ msgstr "&Informazioni su Internet Explorer..." #: ieframe.rc:67 msgctxt "home page" msgid "Home" -msgstr "Inizio" +msgstr "Pagina iniziale" #: ieframe.rc:68 winhlp32.rc:66 msgid "Print..." @@ -6119,7 +6117,7 @@ msgstr "&Copia sfondo" #: shdoclc.rc:44 msgid "Set as &Desktop Item" -msgstr "Aggiungi come &oggetto del Desktop" +msgstr "Aggiungi come &oggetto della Scrivania" #: shdoclc.rc:46 shdoclc.rc:95 shdoclc.rc:117 user32.rc:62 msgid "Select &All" @@ -6192,7 +6190,7 @@ msgstr "Im&posta come sfondo" #: shdoclc.rc:74 shdoclc.rc:154 shdoclc.rc:178 msgid "Set as &Desktop Item..." -msgstr "Aggiungi come &oggetto del Desktop..." +msgstr "Aggiungi come &oggetto della Scrivania..." #: shdoclc.rc:76 shdoclc.rc:90 shdoclc.rc:114 shdoclc.rc:156 shdoclc.rc:180 #: user32.rc:57 wordpad.rc:101 @@ -9636,7 +9634,7 @@ msgstr "&Linea di comando:" #: progman.rc:171 msgid "&Working directory:" -msgstr "&Directory di &lavoro:" +msgstr "Cartella di &lavoro:" #: progman.rc:173 msgid "&Key combination:" @@ -10510,11 +10508,11 @@ msgstr "Non si aggiorna automaticamente" #: taskmgr.rc:205 msgid "Tiles the windows horizontally on the desktop" -msgstr "Affianca le finestre orizzontalmente sul desktop" +msgstr "Affianca le finestre orizzontalmente sulla scrivania " #: taskmgr.rc:206 msgid "Tiles the windows vertically on the desktop" -msgstr "Affianca le finestre verticalmente sul desktop" +msgstr "Affianca le finestre verticalmente sulla scrivania " #: taskmgr.rc:207 msgid "Minimizes the windows" @@ -10526,7 +10524,7 @@ msgstr "Massimizza le finestre" #: taskmgr.rc:209 msgid "Cascades the windows diagonally on the desktop" -msgstr "Impila le finestre diagonalmente sul desktop" +msgstr "Impila le finestre diagonalmente sulla scrivania" #: taskmgr.rc:210 msgid "Brings the window front, but does not switch to it" @@ -10942,7 +10940,7 @@ msgstr "Grafica" #: winecfg.rc:38 msgid "Desktop Integration" -msgstr "Integrazione del desktop" +msgstr "Integrazione della Scrivania" #: winecfg.rc:39 msgid "Audio" @@ -11125,11 +11123,11 @@ msgstr "Controlli - Testo" #: winecfg.rc:99 msgid "Menu Background" -msgstr "Menu - Sfondo" +msgstr "Menù - Sfondo" #: winecfg.rc:100 msgid "Menu Text" -msgstr "Menu - Testo" +msgstr "Menù - Testo" #: winecfg.rc:101 msgid "Scrollbar" @@ -11233,11 +11231,11 @@ msgstr "Titolo inattivo - Gradiente della barra" #: winecfg.rc:126 msgid "Menu Highlight" -msgstr "Menu - Selezione" +msgstr "Menù - Selezione" #: winecfg.rc:127 msgid "Menu Bar" -msgstr "Menu - Barra" +msgstr "Menù - Barra" #: wineconsole.rc:57 msgid " Options " @@ -11265,7 +11263,7 @@ msgstr "Controlli" #: wineconsole.rc:66 msgid "Popup menu" -msgstr "Menu a comparsa" +msgstr "Menù a comparsa" #: wineconsole.rc:67 msgid "&Control" @@ -11281,7 +11279,7 @@ msgstr "Modifica rapida" #: wineconsole.rc:70 msgid "&enable" -msgstr "&Abilita" +msgstr "&abilita" #: wineconsole.rc:72 msgid "Command history" @@ -11313,7 +11311,7 @@ msgstr " Configurazione " #: wineconsole.rc:100 msgid "Buffer zone" -msgstr "Buffer" +msgstr "Zona del buffer" #: wineconsole.rc:101 msgid "&Width :" @@ -11325,7 +11323,7 @@ msgstr "&Altezza:" #: wineconsole.rc:108 msgid "Window size" -msgstr "Dimensione finestra" +msgstr "Dimensione della finestra" #: wineconsole.rc:109 msgid "W&idth :"

1 0

Nikolay Sivov : msxml3: Implement get_nodeTypeValue() for attributes without a type.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: dd9a2effd5efa09388e76e0282f2e3f206cbbdb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd9a2effd5efa09388e76e028… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 5 13:42:41 2011 +0300 msxml3: Implement get_nodeTypeValue() for attributes without a type. --- dlls/msxml3/attribute.c | 35 ++++++++++++++++++++++++++++++++--- 1 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index b67a5b4..fc96658 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -448,11 +448,40 @@ static HRESULT WINAPI domattr_get_definition( static HRESULT WINAPI domattr_get_nodeTypedValue( IXMLDOMAttribute *iface, - VARIANT* var1) + VARIANT* value) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - FIXME("(%p)->(%p)\n", This, var1); - return return_null_var(var1); + IXMLDOMDocument *doc; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, value); + + hr = IXMLDOMAttribute_get_ownerDocument(iface, &doc); + if (hr == S_OK) + { + IXMLDOMDocument2 *doc2; + + hr = IXMLDOMDocument_QueryInterface(doc, &IID_IXMLDOMDocument2, (void**)&doc2); + IXMLDOMDocument_Release(doc); + + if (hr == S_OK) + { + VARIANT schemas; + + hr = IXMLDOMDocument2_get_schemas(doc2, &schemas); + IXMLDOMDocument2_Release(doc2); + + if (hr != S_OK) + return IXMLDOMAttribute_get_value(iface, value); + else + { + FIXME("need to query schema for attribute type\n"); + VariantClear(&schemas); + } + } + } + + return return_null_var(value); } static HRESULT WINAPI domattr_put_nodeTypedValue(

1 0

Jacek Caban : mshtml: Wine Gecko 1.4 release.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 2e5f73e4d75cc510d761fb2bd3adf58c8ca72a8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e5f73e4d75cc510d761fb2bd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 9 18:11:42 2011 +0100 mshtml: Wine Gecko 1.4 release. --- dlls/appwiz.cpl/addons.c | 6 +- dlls/mshtml/editor.c | 12 +-- dlls/mshtml/htmldoc.c | 37 ++--- dlls/mshtml/htmldoc3.c | 16 +-- dlls/mshtml/htmldoc5.c | 11 +- dlls/mshtml/htmlimg.c | 4 +- dlls/mshtml/htmlwindow.c | 17 +-- dlls/mshtml/nsevents.c | 2 +- dlls/mshtml/nsiface.idl | 439 ++++++++++++++++++++++++++++------------------ dlls/mshtml/nsio.c | 26 +++- 10 files changed, 318 insertions(+), 252 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e5f73e4d75cc510d761f…

1 0

Octavian Voicu : ddraw: Make IDirectDrawClipperImpl_[GS] etHWnd function names consistent with SDK.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 8a6a1570745dfa823de6d90119ff98741f9d7b3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a6a1570745dfa823de6d9011… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Wed Nov 9 17:17:13 2011 +0200 ddraw: Make IDirectDrawClipperImpl_[GS]etHWnd function names consistent with SDK. --- dlls/ddraw/clipper.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c index a8fd248..43d50ca 100644 --- a/dlls/ddraw/clipper.c +++ b/dlls/ddraw/clipper.c @@ -106,7 +106,7 @@ static ULONG WINAPI IDirectDrawClipperImpl_Release(IDirectDrawClipper *iface) } /***************************************************************************** - * IDirectDrawClipper::SetHwnd + * IDirectDrawClipper::SetHWnd * * Assigns a hWnd to the clipper interface. * @@ -120,7 +120,7 @@ static ULONG WINAPI IDirectDrawClipperImpl_Release(IDirectDrawClipper *iface) * *****************************************************************************/ -static HRESULT WINAPI IDirectDrawClipperImpl_SetHwnd(IDirectDrawClipper *iface, DWORD dwFlags, +static HRESULT WINAPI IDirectDrawClipperImpl_SetHWnd(IDirectDrawClipper *iface, DWORD dwFlags, HWND hWnd) { IDirectDrawClipperImpl *This = impl_from_IDirectDrawClipper(iface); @@ -200,9 +200,9 @@ static HRESULT WINAPI IDirectDrawClipperImpl_SetClipList(IDirectDrawClipper *ifa } /***************************************************************************** - * IDirectDrawClipper::GetHwnd + * IDirectDrawClipper::GetHWnd * - * Returns the hwnd assigned with SetHwnd + * Returns the hwnd assigned with SetHWnd * * Arguments: * hWndPtr: Address to store the HWND at @@ -292,7 +292,7 @@ static const struct IDirectDrawClipperVtbl ddraw_clipper_vtbl = IDirectDrawClipperImpl_Initialize, IDirectDrawClipperImpl_IsClipListChanged, IDirectDrawClipperImpl_SetClipList, - IDirectDrawClipperImpl_SetHwnd + IDirectDrawClipperImpl_SetHWnd }; HRESULT ddraw_clipper_init(IDirectDrawClipperImpl *clipper)

1 0

Hans Leidekker : imm32: Validate the window handle passed to ImmGetContext.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 21a477e161589630ed94e5561a595c63155e0e8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=21a477e161589630ed94e5561… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 9 15:06:49 2011 +0100 imm32: Validate the window handle passed to ImmGetContext. --- dlls/imm32/imm.c | 8 +++++++- dlls/imm32/tests/imm32.c | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index a8392ff..decdcae 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1360,9 +1360,15 @@ BOOL WINAPI ImmGetCompositionWindow(HIMC hIMC, LPCOMPOSITIONFORM lpCompForm) */ HIMC WINAPI ImmGetContext(HWND hWnd) { - HIMC rc = NULL; + HIMC rc; TRACE("%p\n", hWnd); + + if (!IsWindow(hWnd)) + { + SetLastError(ERROR_INVALID_WINDOW_HANDLE); + return NULL; + } if (!IMM_GetThreadData()->defaultContext) IMM_GetThreadData()->defaultContext = ImmCreateContext(); diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 39bedb2..eca4d5e 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -557,6 +557,22 @@ static void test_ImmIsUIMessage(void) } } +static void test_ImmGetContext(void) +{ + HIMC himc; + DWORD err; + + SetLastError(0xdeadbeef); + himc = ImmGetContext((HWND)0xffffffff); + err = GetLastError(); + ok(himc == NULL, "ImmGetContext succeeded\n"); + ok(err == ERROR_INVALID_WINDOW_HANDLE, "got %u\n", err); + + himc = ImmGetContext(hwnd); + ok(himc != NULL, "ImmGetContext failed\n"); + ok(ImmReleaseContext(hwnd, himc), "ImmReleaseContext failed\n"); +} + START_TEST(imm32) { if (init()) { @@ -567,6 +583,7 @@ START_TEST(imm32) { test_ImmAssociateContextEx(); test_ImmThreads(); test_ImmIsUIMessage(); + test_ImmGetContext(); } cleanup(); }

1 0

Hans Leidekker : winhttp: Use a separate function to set request parameters .
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 5d6425498695ca26791301f23af5f2ef95f1b07b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d6425498695ca26791301f23… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 9 15:05:07 2011 +0100 winhttp: Use a separate function to set request parameters. --- dlls/winhttp/request.c | 42 ++++++++++++++++++++---------------------- 1 files changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 899e8b5..51c433e 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2841,6 +2841,25 @@ error: return HRESULT_FROM_WIN32( err ); } +static DWORD request_set_parameters( struct winhttp_request *request ) +{ + if (!WinHttpSetOption( request->hrequest, WINHTTP_OPTION_PROXY, &request->proxy, + sizeof(request->proxy) )) return get_last_error(); + + if (!WinHttpSetOption( request->hrequest, WINHTTP_OPTION_AUTOLOGON_POLICY, &request->logon_policy, + sizeof(request->logon_policy) )) return get_last_error(); + + if (!WinHttpSetOption( request->hrequest, WINHTTP_OPTION_DISABLE_FEATURE, &request->disable_feature, + sizeof(request->disable_feature) )) return get_last_error(); + + if (!WinHttpSetTimeouts( request->hrequest, + request->resolve_timeout, + request->connect_timeout, + request->send_timeout, + request->receive_timeout )) return get_last_error(); + return ERROR_SUCCESS; +} + static HRESULT request_send( struct winhttp_request *request ) { SAFEARRAY *sa = NULL; @@ -2851,28 +2870,7 @@ static HRESULT request_send( struct winhttp_request *request ) BOOL ret; DWORD err; - if (!WinHttpSetOption( request->hrequest, WINHTTP_OPTION_PROXY, &request->proxy, sizeof(request->proxy) )) - { - return HRESULT_FROM_WIN32( get_last_error() ); - } - if (!WinHttpSetOption( request->hrequest, WINHTTP_OPTION_AUTOLOGON_POLICY, &request->logon_policy, - sizeof(request->logon_policy) )) - { - return HRESULT_FROM_WIN32( get_last_error() ); - } - if (!WinHttpSetOption( request->hrequest, WINHTTP_OPTION_DISABLE_FEATURE, &request->disable_feature, - sizeof(request->disable_feature) )) - { - return HRESULT_FROM_WIN32( get_last_error() ); - } - if (!WinHttpSetTimeouts( request->hrequest, - request->resolve_timeout, - request->connect_timeout, - request->send_timeout, - request->receive_timeout )) - { - return HRESULT_FROM_WIN32( get_last_error() ); - } + if ((err = request_set_parameters( request ))) return HRESULT_FROM_WIN32( err ); VariantInit( &data ); if (strcmpW( request->verb, getW ) && VariantChangeType( &data, &request->data, 0, VT_ARRAY|VT_UI1 ) == S_OK) {

1 0

Hans Leidekker : winhttp: Fix sending data with synchronous requests.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 82965248d141042ad712a2b6aedd80010ce8a12e URL: http://source.winehq.org/git/wine.git/?a=commit;h=82965248d141042ad712a2b6a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 9 15:04:41 2011 +0100 winhttp: Fix sending data with synchronous requests. --- dlls/winhttp/request.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 0d9e60a..899e8b5 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2931,9 +2931,9 @@ static HRESULT WINAPI winhttp_request_Send( LeaveCriticalSection( &request->cs ); return S_OK; } + request->data = body; if (request->wait) /* async request */ { - request->data = body; if (!(request->thread = CreateThread( NULL, 0, send_and_receive_proc, request, 0, NULL ))) { LeaveCriticalSection( &request->cs );

1 0

Hans Leidekker : scrrun: Add a version resource.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: bdbd17c72af28da249806aa033e1f6e53d68c562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdbd17c72af28da249806aa03… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 9 15:04:15 2011 +0100 scrrun: Add a version resource. --- dlls/scrrun/Makefile.in | 2 ++ dlls/scrrun/scrrun.rc | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/scrrun/Makefile.in b/dlls/scrrun/Makefile.in index 46d8748..38f7652 100644 --- a/dlls/scrrun/Makefile.in +++ b/dlls/scrrun/Makefile.in @@ -2,4 +2,6 @@ MODULE = scrrun.dll C_SRCS = scrrun.c +RC_SRCS = scrrun.rc + @MAKE_DLL_RULES@ diff --git a/dlls/scrrun/scrrun.rc b/dlls/scrrun/scrrun.rc new file mode 100644 index 0000000..66dcaa8 --- /dev/null +++ b/dlls/scrrun/scrrun.rc @@ -0,0 +1,28 @@ +/* + * Copyright 2011 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" + +#define WINE_FILEDESCRIPTION_STR "Wine ScrRun dll" +#define WINE_FILENAME_STR "scrrun.dll" +#define WINE_FILEVERSION 5,8,7600,16385 +#define WINE_FILEVERSION_STR "5.8.7600.16385" +#define WINE_PRODUCTVERSION 5,8,7600,16385 +#define WINE_PRODUCTVERSION_STR "5.8.7600.16385" + +#include "wine/wine_common_ver.rc"

1 0

Hans Leidekker : scrrun: New dll.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 8e74ee58d510eb1c770941a6b0fdca83147aa195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e74ee58d510eb1c770941a6b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 9 15:03:53 2011 +0100 scrrun: New dll. --- configure | 1 + configure.ac | 1 + dlls/scrrun/Makefile.in | 5 +++++ dlls/scrrun/scrrun.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/scrrun/scrrun.spec | 6 ++++++ 5 files changed, 56 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 46cbd5f..6762f90 100755 --- a/configure +++ b/configure @@ -15138,6 +15138,7 @@ wine_fn_config_dll scarddlg enable_scarddlg wine_fn_config_dll sccbase enable_sccbase wine_fn_config_dll schannel enable_schannel wine_fn_config_test dlls/schannel/tests schannel_test +wine_fn_config_dll scrrun enable_scrrun wine_fn_config_dll secur32 enable_secur32 implib wine_fn_config_test dlls/secur32/tests secur32_test wine_fn_config_dll security enable_security diff --git a/configure.ac b/configure.ac index 76e8e95..36a7642 100644 --- a/configure.ac +++ b/configure.ac @@ -2756,6 +2756,7 @@ WINE_CONFIG_DLL(scarddlg) WINE_CONFIG_DLL(sccbase) WINE_CONFIG_DLL(schannel) WINE_CONFIG_TEST(dlls/schannel/tests) +WINE_CONFIG_DLL(scrrun) WINE_CONFIG_DLL(secur32,,[implib]) WINE_CONFIG_TEST(dlls/secur32/tests) WINE_CONFIG_DLL(security) diff --git a/dlls/scrrun/Makefile.in b/dlls/scrrun/Makefile.in new file mode 100644 index 0000000..46d8748 --- /dev/null +++ b/dlls/scrrun/Makefile.in @@ -0,0 +1,5 @@ +MODULE = scrrun.dll + +C_SRCS = scrrun.c + +@MAKE_DLL_RULES@ diff --git a/dlls/scrrun/scrrun.c b/dlls/scrrun/scrrun.c new file mode 100644 index 0000000..84a7bef --- /dev/null +++ b/dlls/scrrun/scrrun.c @@ -0,0 +1,43 @@ +/* + * Copyright 2011 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(scrrun); + +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + TRACE("%p, %u, %p\n", hinst, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} diff --git a/dlls/scrrun/scrrun.spec b/dlls/scrrun/scrrun.spec new file mode 100644 index 0000000..5316d8f --- /dev/null +++ b/dlls/scrrun/scrrun.spec @@ -0,0 +1,6 @@ +@ stub DLLGetDocumentation +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer +@ stub DoOpenPipeStream

1 0

← Newer
1
...
57
58
59
60
61
62
63
...
86
Older →

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 November 2011