wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Thomas Mullaly : urlmon/tests: Removed a test that causes random failures on some machines.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 24aa18d91491b36a94d20c22557fe243f29b6953 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24aa18d91491b36a94d20c225… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sat Sep 10 13:11:37 2011 -0400 urlmon/tests: Removed a test that causes random failures on some machines. --- dlls/urlmon/tests/sec_mgr.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index c8d5b8b..afd0d97 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -1631,7 +1631,6 @@ static const struct { {"about:blank",0,0,URLZONE_INTERNET}, {"ftp://zone3.winetest/file.test",0,0,URLZONE_INTERNET}, {"/file/testing/test.test",Uri_CREATE_ALLOW_RELATIVE,0,URLZONE_INTERNET}, - {"file/testing/test.test",Uri_CREATE_ALLOW_RELATIVE,0,URLZONE_INTERNET}, {"zip://testing.com/",0,0,URLZONE_INTERNET}, {"zip:testing.com",0,0,URLZONE_INTERNET} };

1 0

Jacek Caban : user32: Make GetWindowInfo hotpatchable.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: ab37b86236fcd54be93dcd5e0ca7b52bbcc95aad URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab37b86236fcd54be93dcd5e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Sep 10 14:13:05 2011 +0200 user32: Make GetWindowInfo hotpatchable. --- dlls/user32/win.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index b61d183..e3e8265 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3395,7 +3395,7 @@ UINT WINAPI GetWindowModuleFileNameW( HWND hwnd, LPWSTR module, UINT size ) * * Note: tests show that Windows doesn't check cbSize of the structure. */ -BOOL WINAPI GetWindowInfo( HWND hwnd, PWINDOWINFO pwi) +BOOL WINAPI DECLSPEC_HOTPATCH GetWindowInfo( HWND hwnd, PWINDOWINFO pwi) { if (!pwi) return FALSE; if (!WIN_GetRectangles( hwnd, COORDS_SCREEN, &pwi->rcWindow, &pwi->rcClient )) return FALSE;

1 0

Marcus Meissner : dinput: Fixed bad sizeof (pointer -> struct) (Coverity).
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: a038ec330a81dd3cf7bf7c77a061a9f20cd634ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=a038ec330a81dd3cf7bf7c77a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Sep 10 11:25:16 2011 +0200 dinput: Fixed bad sizeof (pointer -> struct) (Coverity). --- dlls/dinput/config.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index 9e080f1..dee76a3 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -368,7 +368,7 @@ static INT_PTR CALLBACK ConfigureDevicesDlgProc(HWND dialog, UINT uMsg, WPARAM w init_listview_columns(dialog); /* Create a backup action format for CANCEL and RESET operations */ - data->original_lpdiaf = HeapAlloc(GetProcessHeap(), 0, sizeof(LPDIACTIONFORMATW)); + data->original_lpdiaf = HeapAlloc(GetProcessHeap(), 0, sizeof(*data->original_lpdiaf)); data->original_lpdiaf->dwNumActions = data->lpdiaf->dwNumActions; data->original_lpdiaf->rgoAction = HeapAlloc(GetProcessHeap(), 0, sizeof(DIACTIONW)*data->lpdiaf->dwNumActions); copy_actions(data->original_lpdiaf, data->lpdiaf);

1 0

Maarten Lankhorst : kernel32: Fix overflow on 32-bits systems.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 81a6be568e69fd77ff6de4db198d627d8810c1bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=81a6be568e69fd77ff6de4db1… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Sep 10 11:22:59 2011 +0200 kernel32: Fix overflow on 32-bits systems. --- dlls/kernel32/heap.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 598bfe4..db21b7a 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1204,17 +1204,17 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) /* new style /proc/meminfo ... */ if (sscanf(buffer, "MemTotal: %lu", &total)) - lpmemex->ullTotalPhys = total*1024; + lpmemex->ullTotalPhys = (ULONG64)total*1024; if (sscanf(buffer, "MemFree: %lu", &free)) - lpmemex->ullAvailPhys = free*1024; + lpmemex->ullAvailPhys = (ULONG64)free*1024; if (sscanf(buffer, "SwapTotal: %lu", &total)) - lpmemex->ullTotalPageFile = total*1024; + lpmemex->ullTotalPageFile = (ULONG64)total*1024; if (sscanf(buffer, "SwapFree: %lu", &free)) - lpmemex->ullAvailPageFile = free*1024; + lpmemex->ullAvailPageFile = (ULONG64)free*1024; if (sscanf(buffer, "Buffers: %lu", &buffers)) - lpmemex->ullAvailPhys += buffers*1024; + lpmemex->ullAvailPhys += (ULONG64)buffers*1024; if (sscanf(buffer, "Cached: %lu", &cached)) - lpmemex->ullAvailPhys += cached*1024; + lpmemex->ullAvailPhys += (ULONG64)cached*1024; } fclose( f ); }

1 0

Marcus Meissner : user32: Fixed single byte array overflow.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: d177a97d287221a26987049ae29cf6e40c80cd2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d177a97d287221a26987049ae… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Sep 10 00:40:07 2011 +0200 user32: Fixed single byte array overflow. --- dlls/user32/wsprintf.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/wsprintf.c b/dlls/user32/wsprintf.c index fe20536..5e618d6 100644 --- a/dlls/user32/wsprintf.c +++ b/dlls/user32/wsprintf.c @@ -316,7 +316,7 @@ static INT wvsnprintfA( LPSTR buffer, UINT maxlen, LPCSTR spec, __ms_va_list arg WPRINTF_FORMAT format; LPSTR p = buffer; UINT i, len, sign; - CHAR number[20]; + CHAR number[21]; /* 64bit number can be 18446744073709551616 which is 20 chars. and a \0 */ WPRINTF_DATA argData; TRACE("%p %u %s\n", buffer, maxlen, debugstr_a(spec)); @@ -421,7 +421,7 @@ static INT wvsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, __ms_va_list a WPRINTF_FORMAT format; LPWSTR p = buffer; UINT i, len, sign; - CHAR number[20]; + CHAR number[21]; /* 64bit number can be 18446744073709551616 which is 20 chars. and a \0 */ WPRINTF_DATA argData; TRACE("%p %u %s\n", buffer, maxlen, debugstr_w(spec));

1 0

Josh Juran : gdi32: Simplify logic in WineEngGetFontData().
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: b27e814de6fe9e784a851fe1ed7cfa934a591c61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b27e814de6fe9e784a851fe1e… Author: Josh Juran <josh(a)iswifter.net> Date: Fri Sep 9 14:19:12 2011 -0700 gdi32: Simplify logic in WineEngGetFontData(). --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 716a37f..d71b0c5 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6198,7 +6198,7 @@ DWORD WineEngGetFontData(GdiFont *font, DWORD table, DWORD offset, LPVOID buf, if(!FT_IS_SFNT(ft_face)) return GDI_ERROR; - if(!buf || !cbData) + if(!buf) len = 0; else len = cbData;

1 0

Andrew Talbot : openal32: Avoid forward declarations of static arrays.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 42207504a29dfc42ef1ed6688e54aaa85d4f2563 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42207504a29dfc42ef1ed6688… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Sep 9 22:12:55 2011 +0100 openal32: Avoid forward declarations of static arrays. --- dlls/openal32/openal.c | 95 ++++++++++++++++++++++++------------------------ 1 files changed, 48 insertions(+), 47 deletions(-) diff --git a/dlls/openal32/openal.c b/dlls/openal32/openal.c index 6a8e8f1..ec4149c 100644 --- a/dlls/openal32/openal.c +++ b/dlls/openal32/openal.c @@ -79,13 +79,8 @@ static ALvoid (AL_APIENTRY*alGetAuxiliaryEffectSlotfv)(ALuint sid, ALenum param, static ALvoid (AL_APIENTRY*alGetAuxiliaryEffectSloti)(ALuint sid, ALenum param, ALint* value); static ALvoid (AL_APIENTRY*alGetAuxiliaryEffectSlotiv)(ALuint sid, ALenum param, ALint* values); -struct FuncList { - const char *name; - void *proc; -}; - -static const struct FuncList ALCFuncs[]; -static const struct FuncList ALFuncs[]; +extern ALCvoid* CDECL wine_alcGetProcAddress(ALCdevice *, const ALCchar *); +extern ALvoid* CDECL wine_alGetProcAddress(const ALchar*); static CRITICAL_SECTION openal_cs; static CRITICAL_SECTION_DEBUG openal_cs_debug = @@ -238,25 +233,6 @@ ALCboolean CDECL wine_alcIsExtensionPresent(ALCdevice *device, const ALCchar *ex return alcIsExtensionPresent(device, extname); } -ALCvoid* CDECL wine_alcGetProcAddress(ALCdevice *device, const ALCchar *funcname) -{ - void *proc; - int i; - - /* Make sure the host implementation has the requested function */ - proc = alcGetProcAddress(device, funcname); - if(!proc) - return NULL; - - for(i = 0;ALCFuncs[i].name;i++) - { - if(strcmp(funcname, ALCFuncs[i].name) == 0) - return ALCFuncs[i].proc; - } - FIXME("Could not find function in list: %s\n", funcname); - return NULL; -} - ALCenum CDECL wine_alcGetEnumValue(ALCdevice *device, const ALCchar *enumname) { return alcGetEnumValue(device, enumname); @@ -344,27 +320,6 @@ ALboolean CDECL wine_alIsExtensionPresent(const ALchar* extname) return alIsExtensionPresent(extname); } -ALvoid* CDECL wine_alGetProcAddress(const ALchar* funcname) -{ - void *proc; - int i; - - /* Make sure the host implementation has the requested function. This will - * also set the last AL error properly if the function should not be - * returned (eg. no current context). */ - proc = alGetProcAddress(funcname); - if(!proc) - return NULL; - - for(i = 0;ALFuncs[i].name;i++) - { - if(strcmp(funcname, ALFuncs[i].name) == 0) - return ALFuncs[i].proc; - } - FIXME("Could not find function in list: %s\n", funcname); - return NULL; -} - ALenum CDECL wine_alGetEnumValue(const ALchar* ename) { return alGetEnumValue(ename); @@ -883,6 +838,10 @@ static ALCcontext* CDECL wine_alcGetThreadContext(ALCvoid) return alcGetThreadContext(); } +struct FuncList { + const char *name; + void *proc; +}; static const struct FuncList ALCFuncs[] = { { "alcCreateContext", wine_alcCreateContext }, @@ -1023,3 +982,45 @@ static const struct FuncList ALFuncs[] = { { NULL, NULL } }; + + +ALCvoid* CDECL wine_alcGetProcAddress(ALCdevice *device, const ALCchar *funcname) +{ + void *proc; + int i; + + /* Make sure the host implementation has the requested function */ + proc = alcGetProcAddress(device, funcname); + if(!proc) + return NULL; + + for(i = 0;ALCFuncs[i].name;i++) + { + if(strcmp(funcname, ALCFuncs[i].name) == 0) + return ALCFuncs[i].proc; + } + FIXME("Could not find function in list: %s\n", funcname); + return NULL; +} + + +ALvoid* CDECL wine_alGetProcAddress(const ALchar* funcname) +{ + void *proc; + int i; + + /* Make sure the host implementation has the requested function. This will + * also set the last AL error properly if the function should not be + * returned (eg. no current context). */ + proc = alGetProcAddress(funcname); + if(!proc) + return NULL; + + for(i = 0;ALFuncs[i].name;i++) + { + if(strcmp(funcname, ALFuncs[i].name) == 0) + return ALFuncs[i].proc; + } + FIXME("Could not find function in list: %s\n", funcname); + return NULL; +}

1 0

Andrew Talbot : krnl386.exe16: Constify some variables.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: f0a7bc130815ac01b9bc219a8b67abc4909d1e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0a7bc130815ac01b9bc219a8… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Sep 9 22:12:50 2011 +0100 krnl386.exe16: Constify some variables. --- dlls/krnl386.exe16/ne_module.c | 14 ++++++++------ dlls/krnl386.exe16/snoop.c | 11 ++++++----- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index 95dcab8..2fd367a 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -963,8 +963,8 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ NE_MODULE *pModule; const IMAGE_DOS_HEADER *descr = NULL; const char *file_name = NULL; - char dllname[32], *p; - const char *basename, *main_module; + char dllname[32]; + const char *basename, *main_module, *p; /* strip path information */ @@ -975,12 +975,14 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ if (strlen(basename) < sizeof(dllname)-6) { + char *q; + strcpy( dllname, basename ); - p = strrchr( dllname, '.' ); - if (!p) strcat( dllname, ".dll" ); - for (p = dllname; *p; p++) if (*p >= 'A' && *p <= 'Z') *p += 32; + q = strrchr( dllname, '.' ); + if (!q) strcat( dllname, ".dll" ); + for (q = dllname; *q; q++) if (*q >= 'A' && *q <= 'Z') *q += 32; - strcpy( p, "16" ); + strcpy( q, "16" ); if ((mod32 = LoadLibraryA( dllname ))) { if (!(descr = (void *)GetProcAddress( mod32, "__wine_spec_dos_header" ))) diff --git a/dlls/krnl386.exe16/snoop.c b/dlls/krnl386.exe16/snoop.c index 4b8477c..cef0fda 100644 --- a/dlls/krnl386.exe16/snoop.c +++ b/dlls/krnl386.exe16/snoop.c @@ -99,7 +99,8 @@ static HANDLE16 xsnr = 0; void SNOOP16_RegisterDLL(HMODULE16 hModule,LPCSTR name) { SNOOP16_DLL **dll = &(firstdll); - char *s; + const char *p; + char *q; if (!TRACE_ON(snoop)) return; @@ -146,11 +147,11 @@ SNOOP16_RegisterDLL(HMODULE16 hModule,LPCSTR name) { (*dll)->next = NULL; (*dll)->hmod = hModule; - if ((s=strrchr(name,'\\'))) - name = s+1; + if ((p=strrchr(name,'\\'))) + name = p+1; strcpy( (*dll)->name, name ); - if ((s=strrchr((*dll)->name,'.'))) - *s='\0'; + if ((q=strrchr((*dll)->name,'.'))) + *q='\0'; (*dll)->funhandle = GlobalHandleToSel16(GLOBAL_Alloc(GMEM_ZEROINIT,65535,0,WINE_LDT_FLAGS_CODE)); (*dll)->funs = GlobalLock16((*dll)->funhandle); if (!(*dll)->funs) {

1 0

Andrew Talbot : d3dx9_36: Eliminate comparisons of unsigned values about zero.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 22beb872f2565cbfbea39685505d45074a1a804d URL: http://source.winehq.org/git/wine.git/?a=commit;h=22beb872f2565cbfbea396855… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Sep 9 22:12:43 2011 +0100 d3dx9_36: Eliminate comparisons of unsigned values about zero. --- dlls/d3dx9_36/mesh.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index c6317c8..760931c 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -638,7 +638,7 @@ static HRESULT propagate_face_vertices(CONST DWORD *adjacency, DWORD *point_reps { DWORD adj_face = adjacency[face_base + edge]; DWORD adj_face_base; - DWORD i,j; + DWORD i; if (adj_face == -1) /* No adjacent face. */ continue; else if (adj_face >= numfaces) @@ -659,9 +659,9 @@ static HRESULT propagate_face_vertices(CONST DWORD *adjacency, DWORD *point_reps } /* Replaces vertices in opposite edge with vertices from current edge. */ - for (i = 0, j = 1; i < 2 && (j+1) > 0; i++, j--) + for (i = 0; i < 2; i++) { - DWORD from = face_base + (edge + j) % VERTS_PER_FACE; + DWORD from = face_base + (edge + (1 - i)) % VERTS_PER_FACE; DWORD to = adj_face_base + (opp_edge + i) % VERTS_PER_FACE; /* Propagate lowest index. */ @@ -759,9 +759,11 @@ static HRESULT WINAPI ID3DXMeshImpl_ConvertAdjacencyToPointReps(ID3DXMesh *iface if (FAILED(hr)) goto cleanup; } /* Go in opposite direction to catch all face orderings */ - for (face = This->numfaces - 1; face + 1 > 0; face--) + for (face = 0; face < This->numfaces; face++) { - hr = propagate_face_vertices(adjacency, point_reps, indices, new_indices, face, This->numfaces); + hr = propagate_face_vertices(adjacency, point_reps, + indices, new_indices, + (This->numfaces - 1) - face, This->numfaces); if (FAILED(hr)) goto cleanup; }

1 0

Łukasz Wojniłowicz : Polish translation for release 1.3.28 (try 2)
by Jeremy Newman 12 Sep '11

12 Sep '11

Module: website Branch: master Commit: 8ff9860772e6248e81ac516ec56012cb54f1003f URL: http://source.winehq.org/git/website.git/?a=commit;h=8ff9860772e6248e81ac51… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Sep 11 16:30:37 2011 +0200 Polish translation for release 1.3.28 (try 2) >From 8002279de7d0ca8f9df4ef0de7b4bcdf2f0b63a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Wojni=C5=82owicz?= <lukasz.wojnilowicz(a)gmail.com> Date: Sun, 11 Sep 2011 13:22:22 +0200 Subject: Polish translation for release 1.3.28 --- news/pl/2011090901.xml | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/news/pl/2011090901.xml b/news/pl/2011090901.xml new file mode 100644 index 0000000..06b654c --- /dev/null +++ b/news/pl/2011090901.xml @@ -0,0 +1,19 @@ +<news> +<date>Wrzesień 9, 2011</date> +<title>Wydano Wine 1.3.28</title> +<body> + Wydanie rozwojowe Wine 1.3.28 jest już dostępne. + <a href="{$root}/announce/1.3.28">Co nowego</a> w tym wydaniu: +<ul> + <li>Wstępna wersja programu przetwarzającego VBScript.</li> + <li>Automagiczny wybór sterownika dźwiękowego.</li> + <li>Wsparcie dla informacji o wolumenie na systemach plików UDF.</li> + <li>Program wyświetlający OpenGL jest teraz domyślny dla DirectDraw.</li> + <li>Okno dialogowe konfiguracji urządzenia w DirectInput.</li> + <li>Wsparcie SetDIBitsToDevice w silniku DIB.</li> + <li>Kilka ulepszeń w programie przetwarzającym cmd.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.28.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

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