April 2013 - Wine-commits - list.winehq.org

Andrew Talbot : winmm: Remove unneeded address-of operator from function name.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: 11ebf851b2e9fad063ab37e4a94c39ea931a644b URL: http://source.winehq.org/git/wine.git/?a=commit;h=11ebf851b2e9fad063ab37e4a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 30 22:42:00 2013 +0000 winmm: Remove unneeded address-of operator from function name. --- dlls/winmm/waveform.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index de081e9..76d624a 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2546,7 +2546,7 @@ static BOOL WINMM_StartDevicesThread(void) /* The devices thread holds a reference to the winmm module * to prevent it from unloading while it's running. */ GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, - (const WCHAR *)&WINMM_StartDevicesThread, &g_devthread_module); + (const WCHAR *)WINMM_StartDevicesThread, &g_devthread_module); events[0] = CreateEventW(NULL, FALSE, FALSE, NULL);

1 0

Andrew Talbot : msvcr90: void functions should not return a value.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: c072ac1071722bbd6136873b4de763a9ee257c0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c072ac1071722bbd6136873b4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 30 22:41:56 2013 +0000 msvcr90: void functions should not return a value. --- dlls/msvcr90/msvcr90.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index dc97160..4787867 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -104,7 +104,7 @@ void* CDECL MSVCR90_operator_new(size_t size) */ void CDECL MSVCR90_operator_delete(void *ptr) { - return MSVCRT_operator_delete(ptr); + MSVCRT_operator_delete(ptr); } /*********************************************************************

1 0

Łukasz Wojniłowicz : po: Update Polish translation.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: 4e3b8621c459fe3e1ada5a5ae4de980d81a02fb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e3b8621c459fe3e1ada5a5ae… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Mar 31 08:54:43 2013 +0200 po: Update Polish translation. --- po/pl.po | 151 +++++++++++++++++++++---------------------------------------- 1 files changed, 52 insertions(+), 99 deletions(-) diff --git a/po/pl.po b/po/pl.po index 0a46fa6..74122ce 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,12 +1,12 @@ # Polish translations for Wine # -# Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>, 2011, 2012. +# Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>, 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-10-05 17:26+0200\n" +"PO-Revision-Date: 2013-03-31 08:50+0200\n" "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>\n" "Language-Team: Polish <kde-i18n-doc(a)kde.org>\n" "Language: Polish\n" @@ -3460,11 +3460,11 @@ msgstr "&Włącz" #: joy.rc:38 msgid "Connected" -msgstr "Podłączony" +msgstr "Włączone" #: joy.rc:40 msgid "Disabled" -msgstr "Wyłączony" +msgstr "Wyłączone" #: joy.rc:42 msgid "" @@ -3560,7 +3560,7 @@ msgstr "Niezakończona stała znakowa" #: jscript.rc:39 msgid "'return' statement outside of function" -msgstr "" +msgstr "polecenie powrotu 'return' jest poza funkcją" #: jscript.rc:40 msgid "Can't have 'break' outside of loop" @@ -8290,44 +8290,37 @@ msgid "Security Warning" msgstr "Ostrzeżenie o zabezpieczeniach" #: urlmon.rc:32 -#, fuzzy -#| msgid "Do you want to continue anyway?" msgid "Do you want to install this software?" -msgstr "Czy mimo to chcesz kontynuować?" +msgstr "Czy chcesz zainstalować to oprogramowanie?" #: urlmon.rc:34 explorer.rc:29 msgid "Location:" msgstr "Położenie:" #: urlmon.rc:36 -#, fuzzy -#| msgid "Install/Uninstall" msgid "Don't install" -msgstr "Zainstaluj/Odinstaluj" +msgstr "Nie instaluj" #: urlmon.rc:40 msgid "" "When installed, an ActiveX component has full access to your computer. Do " "not click install unless you have absolute trust in the above source." msgstr "" +"Składnik ActiveX ma pełny dostęp do twojego komputera, jeśli jest " +"zainstalowany. Nie klikaj zainstaluj dopóki nie masz pełnego zaufania do " +"powyższego źródła." #: urlmon.rc:48 -#, fuzzy -#| msgid "Installation transform failed to apply.\n" msgid "Installation of component failed: %08x" -msgstr "Nieudane zastosowanie transformacji instalacji.\n" +msgstr "Nieudana instalacja składnika: %08x" #: urlmon.rc:49 -#, fuzzy -#| msgid "&Install" msgid "Install (%d)" -msgstr "&Zainstaluj" +msgstr "Zainstaluj (%d)" #: urlmon.rc:50 -#, fuzzy -#| msgid "&Install" msgid "Install" -msgstr "&Zainstaluj" +msgstr "Zainstaluj" #: user32.rc:27 user32.rc:40 taskmgr.rc:138 msgctxt "window" @@ -10146,10 +10139,8 @@ msgid "Wine Command Prompt" msgstr "Wiersz Poleceń Wine" #: cmd.rc:349 -#, fuzzy -#| msgid "CMD Version %1!S!\n" msgid "Wine CMD Version %1!S!\n" -msgstr "Wersja CMD %1!S!\n" +msgstr "Wine CMD Wersja %1!S!\n" #: cmd.rc:350 msgid "More? " @@ -10179,30 +10170,32 @@ msgstr " (Tak|Nie|Wszystkie)" msgid "" "Can't recognize '%1' as an internal or external command, or batch script.\n" msgstr "" +"Nie można rozpoznać '%1' ani jako polecenia wewnętrznego, ani zewnętrznego, " +"czy nawet skryptu wsadowego.\n" #: cmd.rc:357 msgid "Division by zero error.\n" -msgstr "" +msgstr "Błąd dzielenia przez zero.\n" #: cmd.rc:358 msgid "Expected an operand.\n" -msgstr "" +msgstr "Oczekiwano zmiennej niezależnej.\n" #: cmd.rc:359 -#, fuzzy -#| msgid "Unexpected network error.\n" msgid "Expected an operator.\n" -msgstr "Nieoczekiwany błąd sieciowy.\n" +msgstr "Oczekiwano operatora.\n" #: cmd.rc:360 msgid "Mismatch in parentheses.\n" -msgstr "" +msgstr "Nierówna liczba nawiasach.\n" #: cmd.rc:361 msgid "" "Badly formed number - must be one of decimal (12),\n" " hexadecimal (0x34) or octal (056).\n" msgstr "" +"Zły format liczbowy - musi on być jednym z formatów dziesiętnych (12),\n" +" szesnastkowych (0x34) lub ósemkowych (056).\n" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" @@ -10251,13 +10244,11 @@ msgstr "Ethernet" #: ipconfig.rc:32 msgid "Connection-specific DNS suffix" -msgstr "Sufiks DNS konkretnego połączenia" +msgstr "Przedrostek DNS konkretnego połączenia" #: ipconfig.rc:33 -#, fuzzy -#| msgid "IP address" msgid "IPv4 address" -msgstr "adres IP" +msgstr "Adres IPv4" #: ipconfig.rc:34 msgid "Hostname" @@ -10300,10 +10291,8 @@ msgid "Default gateway" msgstr "Brama domyślna" #: ipconfig.rc:47 -#, fuzzy -#| msgid "IP address" msgid "IPv6 address" -msgstr "adres IP" +msgstr "Adres IPv6" #: net.rc:27 msgid "" @@ -10436,152 +10425,116 @@ msgid "The following services are running:\n" msgstr "Uruchomione są następujące usługi:\n" #: netstat.rc:27 -#, fuzzy -#| msgid "LAN Connection" msgid "Active Connections" -msgstr "Połączenie LAN" +msgstr "Aktywne połączenia" #: netstat.rc:28 msgid "Proto" -msgstr "" +msgstr "Protokół" #: netstat.rc:29 -#, fuzzy -#| msgid "Email Address" msgid "Local Address" -msgstr "Adres e-mail" +msgstr "Adres lokalny" #: netstat.rc:30 -#, fuzzy -#| msgid "Street Address" msgid "Foreign Address" -msgstr "Ulica" +msgstr "Adres zagraniczny" #: netstat.rc:31 -#, fuzzy -#| msgid "Status" msgid "State" msgstr "Stan" #: netstat.rc:32 -#, fuzzy -#| msgid "Interfaces" msgid "Interface Statistics" -msgstr "Interfejsy" +msgstr "Statystyki interfejsu" #: netstat.rc:33 msgid "Sent" -msgstr "" +msgstr "Wysłano" #: netstat.rc:34 msgid "Received" -msgstr "" +msgstr "Pobrano" #: netstat.rc:35 -#, fuzzy -#| msgid "bytes" msgid "Bytes" -msgstr "bajty(ów)" +msgstr "Bajtów" #: netstat.rc:36 msgid "Unicast packets" -msgstr "" +msgstr "Pakiety unicast" #: netstat.rc:37 msgid "Non-unicast packets" -msgstr "" +msgstr "Pakiety nie-unikast" #: netstat.rc:38 -#, fuzzy -#| msgid "Disclaimer" msgid "Discards" -msgstr "Zrzeczenie" +msgstr "Odrzucenia" #: netstat.rc:39 -#, fuzzy -#| msgid "Error" msgid "Errors" -msgstr "Błąd" +msgstr "Błędy" #: netstat.rc:40 -#, fuzzy -#| msgid "Unknown port.\n" msgid "Unknown protocols" -msgstr "Nieznany port.\n" +msgstr "Nieznane protokoły" #: netstat.rc:41 msgid "TCP Statistics for IPv4" -msgstr "" +msgstr "Statystyki TCP dla IPv4" #: netstat.rc:42 -#, fuzzy -#| msgid "LAN Connection" msgid "Active Opens" -msgstr "Połączenie LAN" +msgstr "Aktywne otwarcia" #: netstat.rc:43 msgid "Passive Opens" -msgstr "" +msgstr "Pasywne otwarcia" #: netstat.rc:44 -#, fuzzy -#| msgid "LAN Connection" msgid "Failed Connection Attempts" -msgstr "Połączenie LAN" +msgstr "Nieudane próby połączenia" #: netstat.rc:45 -#, fuzzy -#| msgid "LAN Connection" msgid "Reset Connections" -msgstr "Połączenie LAN" +msgstr "Wyzerowane połączenia" #: netstat.rc:46 -#, fuzzy -#| msgid "LAN Connection" msgid "Current Connections" -msgstr "Połączenie LAN" +msgstr "Bieżące połączenia" #: netstat.rc:47 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Segments Received" -msgstr "Segment zablokowany.\n" +msgstr "Pobranych segmentów" #: netstat.rc:48 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Segments Sent" -msgstr "Segment zablokowany.\n" +msgstr "Wysłanych segmentów" #: netstat.rc:49 msgid "Segments Retransmitted" -msgstr "" +msgstr "Ponownie przesłanych segmentów" #: netstat.rc:50 msgid "UDP Statistics for IPv4" -msgstr "" +msgstr "Statystyki UDP dla IPv4" #: netstat.rc:51 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Datagrams Received" -msgstr "Segment zablokowany.\n" +msgstr "Pobranych Danogramów" #: netstat.rc:52 -#, fuzzy -#| msgid "Local Port" msgid "No Ports" -msgstr "Port lokalny" +msgstr "Brak portów" #: netstat.rc:53 -#, fuzzy -#| msgid "Decoding Error" msgid "Receive Errors" -msgstr "Błąd podczas dekodowania" +msgstr "Błędów pobrania" #: netstat.rc:54 msgid "Datagrams Sent" -msgstr "" +msgstr "Wysłanych Danogramów" #: notepad.rc:27 msgid "&New\tCtrl+N"

1 0

Dmitry Timoshkov : winspool.drv: Move loading of libcups out of the init code protected by mutex.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: 142c2982dc3ce33a09004a284a5b99328945a654 URL: http://source.winehq.org/git/wine.git/?a=commit;h=142c2982dc3ce33a09004a284… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 1 12:49:22 2013 +0900 winspool.drv: Move loading of libcups out of the init code protected by mutex. --- dlls/winspool.drv/info.c | 41 +++++++++++++++++++++++++++-------------- 1 files changed, 27 insertions(+), 14 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 27a6edd..141b2f4 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -874,6 +874,28 @@ static cups_ptype_t get_cups_printer_type( const cups_dest_t *dest ) return ret; } +static void load_cups(void) +{ + cupshandle = wine_dlopen( SONAME_LIBCUPS, RTLD_NOW, NULL, 0 ); + if (!cupshandle) return; + + TRACE("%p: %s loaded\n", cupshandle, SONAME_LIBCUPS); + +#define DO_FUNC(x) \ + p##x = wine_dlsym( cupshandle, #x, NULL, 0 ); \ + if (!p##x) \ + { \ + ERR("failed to load symbol %s\n", #x); \ + cupshandle = NULL; \ + return; \ + } + CUPS_FUNCS; +#undef DO_FUNC +#define DO_FUNC(x) p##x = wine_dlsym( cupshandle, #x, NULL, 0 ) + CUPS_OPT_FUNCS; +#undef DO_FUNC +} + static BOOL CUPS_LoadPrinters(void) { int i, nrofdests; @@ -882,24 +904,11 @@ static BOOL CUPS_LoadPrinters(void) PRINTER_INFO_2W pi2; WCHAR *port, *ppd_dir = NULL, *ppd; HKEY hkeyPrinter, hkeyPrinters; - char loaderror[256]; WCHAR nameW[MAX_PATH]; HANDLE added_printer; cups_ptype_t printer_type; - cupshandle = wine_dlopen(SONAME_LIBCUPS, RTLD_NOW, loaderror, sizeof(loaderror)); - if (!cupshandle) { - TRACE("%s\n", loaderror); - return FALSE; - } - TRACE("%p: %s loaded\n", cupshandle, SONAME_LIBCUPS); - -#define DO_FUNC(x) p##x = wine_dlsym( cupshandle, #x, NULL, 0 ); if (!p##x) return FALSE - CUPS_FUNCS; -#undef DO_FUNC -#define DO_FUNC(x) p##x = wine_dlsym( cupshandle, #x, NULL, 0 ) - CUPS_OPT_FUNCS; -#undef DO_FUNC + if (!cupshandle) return FALSE; if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != ERROR_SUCCESS) { @@ -1590,6 +1599,10 @@ void WINSPOOL_LoadSystemPrinters(void) WCHAR PrinterName[256]; BOOL done = FALSE; +#ifdef SONAME_LIBCUPS + load_cups(); +#endif + /* FIXME: The init code should be moved to spoolsv.exe */ init_mutex = CreateMutexW( NULL, TRUE, winspool_mutex_name ); if (!init_mutex)

1 0

Nikolay Sivov : comctl32: Initialize id field for message data (Coverity).
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: 6ee869da6dac0e017517938b70ab05ac1025343c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee869da6dac0e017517938b7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 31 12:11:36 2013 +0400 comctl32: Initialize id field for message data (Coverity). --- dlls/comctl32/tests/trackbar.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 17e8bb6..2e76000 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -391,6 +391,7 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + msg.id = 0; add_message(sequences, PARENT_SEQ_INDEX, &msg); }

1 0

Nikolay Sivov : mscms: Free memory and handle on error path (Coverity).
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: 3f3404d2487129db7da6ec5372b7158304292f5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f3404d2487129db7da6ec537… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 31 12:25:12 2013 +0400 mscms: Free memory and handle on error path (Coverity). --- dlls/mscms/profile.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index b0ffce4..8444e14 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -1528,14 +1528,18 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing if (cmsprofile) { struct profile profile; + HPROFILE hprof; profile.file = handle; profile.access = access; profile.iccprofile = iccprofile; profile.cmsprofile = cmsprofile; - return create_profile( &profile ); + if ((hprof = create_profile( &profile ))) return hprof; + HeapFree( GetProcessHeap(), 0, iccprofile ); + cmsCloseProfile( cmsprofile ); } + CloseHandle( handle ); #endif /* HAVE_LCMS */ return NULL;

1 0

Nikolay Sivov : msi: Free records on error paths (Coverity).
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: 58bbe5ac4c4d01de7a4d30bf20516254045ab376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58bbe5ac4c4d01de7a4d30bf2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 31 14:59:33 2013 +0400 msi: Free records on error paths (Coverity). --- dlls/msi/database.c | 6 ++++++ dlls/msi/dialog.c | 1 + 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 9c0d346..b734031 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -1376,7 +1376,10 @@ static UINT merge_verify_colnames(MSIQUERY *dbview, MSIQUERY *mergeview) r = MSI_ViewGetColumnInfo(mergeview, MSICOLINFO_NAMES, &mergerec); if (r != ERROR_SUCCESS) + { + msiobj_release(&dbrec->hdr); return r; + } count = MSI_RecordGetFieldCount(dbrec); for (i = 1; i <= count; i++) @@ -1401,7 +1404,10 @@ static UINT merge_verify_colnames(MSIQUERY *dbview, MSIQUERY *mergeview) r = MSI_ViewGetColumnInfo(mergeview, MSICOLINFO_TYPES, &mergerec); if (r != ERROR_SUCCESS) + { + msiobj_release(&dbrec->hdr); return r; + } count = MSI_RecordGetFieldCount(dbrec); for (i = 1; i <= count; i++) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 1e0e23e..662d09a 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3552,6 +3552,7 @@ static LRESULT msi_dialog_oncreate( HWND hwnd, LPCREATESTRUCTW cs ) if (!dialog->default_font) { dialog->default_font = strdupW(dfv); + msiobj_release( &rec->hdr ); if (!dialog->default_font) return -1; }

1 0

Nikolay Sivov : ole32: Fix possible return of freed pointer (Coverity).
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: 611cf6bb0dcfb07549979c2ada1f7281e03c8c47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=611cf6bb0dcfb07549979c2ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 31 18:54:02 2013 +0400 ole32: Fix possible return of freed pointer (Coverity). --- dlls/ole32/compobj.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 17bd7a1..04d65c9 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -379,6 +379,7 @@ static HRESULT COMPOBJ_DllList_Add(LPCWSTR library_name, OpenDll **ret) entry->DllCanUnloadNow = DllCanUnloadNow; entry->DllGetClassObject = DllGetClassObject; list_add_tail(&openDllList, &entry->entry); + *ret = entry; } else { @@ -386,7 +387,6 @@ static HRESULT COMPOBJ_DllList_Add(LPCWSTR library_name, OpenDll **ret) hr = E_OUTOFMEMORY; FreeLibrary(hLibrary); } - *ret = entry; } LeaveCriticalSection( &csOpenDllList );

1 0

Alexander Monakov : winex11.drv: Simplify test for pbuffer availability.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: 7d61c7b1589df8c58b2da4531679f1afc1116022 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d61c7b1589df8c58b2da4531… Author: Alexander Monakov <amonakov(a)gmail.com> Date: Sun Mar 31 19:07:57 2013 +0400 winex11.drv: Simplify test for pbuffer availability. --- dlls/winex11.drv/opengl.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index b11e8e3..bb3b366 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -3005,10 +3005,7 @@ static void X11DRV_WineGL_LoadExtensions(void) if (has_extension( WineGLInfo.glxExtensions, "GLX_ARB_multisample")) register_extension( "WGL_ARB_multisample" ); - /* In general pbuffer functionality requires support in the X-server. The functionality is - * available either when the GLX_SGIX_pbuffer is present or when the GLX server version is 1.3. - */ - if ( glxRequireVersion(3) && has_extension( WineGLInfo.glxExtensions, "GLX_SGIX_pbuffer") ) + if (glxRequireVersion(3)) { register_extension( "WGL_ARB_pbuffer" ); opengl_funcs.ext.p_wglCreatePbufferARB = X11DRV_wglCreatePbufferARB; @@ -3026,7 +3023,7 @@ static void X11DRV_WineGL_LoadExtensions(void) /* Support WGL_ARB_render_texture when there's support or pbuffer based emulation */ if (has_extension( WineGLInfo.glxExtensions, "GLX_ARB_render_texture") || - (glxRequireVersion(3) && has_extension( WineGLInfo.glxExtensions, "GLX_SGIX_pbuffer") && use_render_texture_emulation)) + (glxRequireVersion(3) && use_render_texture_emulation)) { register_extension( "WGL_ARB_render_texture" ); opengl_funcs.ext.p_wglBindTexImageARB = X11DRV_wglBindTexImageARB;

1 0

Piotr Caban : wininet: Do case-insensitive compare when looking for scheme.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: c8d1d7690913822897645f7db9d7e63dff8f7fd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8d1d7690913822897645f7db… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 13:11:37 2013 +0200 wininet: Do case-insensitive compare when looking for scheme. --- dlls/wininet/internet.c | 2 +- dlls/wininet/tests/url.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index b6e6948..82332b1 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1580,7 +1580,7 @@ static INTERNET_SCHEME GetInternetSchemeW(LPCWSTR lpszScheme, DWORD nMaxCmp) return INTERNET_SCHEME_UNKNOWN; for (i = 0; i < sizeof(url_schemes)/sizeof(url_schemes[0]); i++) - if (!strncmpW(lpszScheme, url_schemes[i], nMaxCmp)) + if (!strncmpiW(lpszScheme, url_schemes[i], nMaxCmp)) return INTERNET_SCHEME_FIRST + i; return INTERNET_SCHEME_UNKNOWN; diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 7817e8f..6d02aad 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -127,6 +127,9 @@ static const crack_url_test_t crack_url_tests[] = { {"http://www.winehq.org/myscript.php;test=123", 0, 4, INTERNET_SCHEME_HTTP, 7, 14, 23, 80, -1, 0, -1, 0, 21, 22, -1, 0, "http", "www.winehq.org", "", "", "/myscript.php;test=123", ""}, + {"HtTp://www.winehq.org/scheme", + 0, 4, INTERNET_SCHEME_HTTP, 7, 14, 23, 80, -1, 0, -1, 0, 21, 7, -1, 0, + "HtTp", "www.winehq.org", "", "", "/scheme", ""}, {"file:///C:/Program%20Files/Atmel/AVR%20Tools/STK500/STK500.xml", 0, 4, INTERNET_SCHEME_FILE, -1, 0, -1, 0, -1, 0, -1, 0, 7, 55, -1, 0, "file", "", "", "", "C:\\Program Files\\Atmel\\AVR Tools\\STK500\\STK500.xml", ""},

1 0