December 2008 - Wine-Commits

Henri Verbeet : wined3d: Make functions static where possible.
by Alexandre Julliard Dec. 3, 2008

Dec. 3, 2008

Module: wine Branch: master Commit: 0ae60765dec301f7054bc7d2e60811da2d147641 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ae60765dec301f7054bc7d2e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 2 18:41:33 2008 +0100 wined3d: Make functions static where possible. --- dlls/wined3d/baseshader.c | 34 ++++++++++++---------------------- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/wined3d_private.h | 23 ----------------------- 3 files changed, 13 insertions(+), 46 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 1427faa..c9f9124 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -32,6 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); #define GLNAME_REQUIRE_GLSL ((const char *)1) +static void shader_dump_param(IWineD3DBaseShader *iface, const DWORD param, const DWORD addr_token, int input); + static inline BOOL shader_is_version_token(DWORD token) { return shader_is_pshader_version(token) || shader_is_vshader_version(token); @@ -99,12 +101,8 @@ const SHADER_OPCODE* shader_get_opcode( /* Read a parameter opcode from the input stream, * and possibly a relative addressing token. * Return the number of tokens read */ -int shader_get_param( - IWineD3DBaseShader* iface, - const DWORD* pToken, - DWORD* param, - DWORD* addr_token) { - +static int shader_get_param(IWineD3DBaseShader *iface, const DWORD *pToken, DWORD *param, DWORD *addr_token) +{ /* PS >= 3.0 have relative addressing (with token) * VS >= 2.0 have relative addressing (with token) * VS >= 1.0 < 2.0 have relative addressing (without token) @@ -139,11 +137,8 @@ static inline int shader_skip_opcode( * Note: This function assumes source or destination token format. * It will not work with specially-formatted tokens like DEF or DCL, * but hopefully those would be recognized */ - -int shader_skip_unrecognized( - IWineD3DBaseShader* iface, - const DWORD* pToken) { - +static int shader_skip_unrecognized(IWineD3DBaseShader *iface, const DWORD *pToken) +{ int tokens_read = 0; int i = 0; @@ -165,9 +160,8 @@ int shader_skip_unrecognized( /* Convert floating point offset relative * to a register file to an absolute offset for float constants */ - -unsigned int shader_get_float_offset(const DWORD reg) { - +static unsigned int shader_get_float_offset(const DWORD reg) +{ unsigned int regnum = reg & WINED3DSP_REGNUM_MASK; int regtype = shader_get_regtype(reg); @@ -602,12 +596,8 @@ static void shader_dump_arr_entry( TRACE("]"); } -void shader_dump_param( - IWineD3DBaseShader *iface, - const DWORD param, - const DWORD addr_token, - int input) { - +static void shader_dump_param(IWineD3DBaseShader *iface, const DWORD param, const DWORD addr_token, int input) +{ IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; static const char * const rastout_reg_names[] = { "oPos", "oFog", "oPts" }; static const char * const misctype_reg_names[] = { "vPos", "vFace"}; @@ -896,8 +886,8 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, } } -void shader_dump_ins_modifiers(const DWORD output) { - +static void shader_dump_ins_modifiers(const DWORD output) +{ DWORD shift = (output & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; DWORD mmask = output & WINED3DSP_DSTMOD_MASK; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index b260f68..c5859d4 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -63,7 +63,7 @@ HRESULT allocate_shader_constants(IWineD3DStateBlockImpl* object) { } /** Copy all members of one stateblock to another */ -void stateblock_savedstates_copy(IWineD3DStateBlock* iface, SAVEDSTATES *dest, const SAVEDSTATES *source) +static void stateblock_savedstates_copy(IWineD3DStateBlock* iface, SAVEDSTATES *dest, const SAVEDSTATES *source) { IWineD3DStateBlockImpl *This = (IWineD3DStateBlockImpl *)iface; unsigned bsize = sizeof(BOOL); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2ca7746..dfbe6c7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1795,8 +1795,6 @@ extern void stateblock_savedstates_set( SAVEDSTATES* states, BOOL value); -extern void stateblock_savedstates_copy(IWineD3DStateBlock *iface, SAVEDSTATES *dest, const SAVEDSTATES *source); - extern void stateblock_copy( IWineD3DStateBlock* destination, IWineD3DStateBlock* source); @@ -2169,29 +2167,10 @@ extern HRESULT shader_get_registers_used( extern void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, const shader_reg_maps *reg_maps, const DWORD *pFunction); -extern void shader_dump_ins_modifiers( - const DWORD output); - -extern void shader_dump_param( - IWineD3DBaseShader *iface, - const DWORD param, - const DWORD addr_token, - int input); - extern void shader_trace_init( IWineD3DBaseShader *iface, const DWORD* pFunction); -extern int shader_get_param( - IWineD3DBaseShader* iface, - const DWORD* pToken, - DWORD* param, - DWORD* addr_token); - -extern int shader_skip_unrecognized( - IWineD3DBaseShader* iface, - const DWORD* pToken); - static inline int shader_get_regtype(const DWORD param) { return (((param & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2)); @@ -2201,8 +2180,6 @@ static inline int shader_get_writemask(const DWORD param) { return param & WINED3DSP_WRITEMASK_ALL; } -extern unsigned int shader_get_float_offset(const DWORD reg); - static inline BOOL shader_is_pshader_version(DWORD token) { return 0xFFFF0000 == (token & 0xFFFF0000); }

1 0

Henri Verbeet : wined3d: Rename resource functions to reflect that they' re not COM functions.
by Alexandre Julliard Dec. 3, 2008

Dec. 3, 2008

Module: wine Branch: master Commit: 2acf8d7947e4d39d96eab0f6d6a5a1c467435fc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2acf8d7947e4d39d96eab0f6d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 2 18:41:33 2008 +0100 wined3d: Rename resource functions to reflect that they're not COM functions. --- dlls/wined3d/basetexture.c | 3 ++- dlls/wined3d/cubetexture.c | 16 ++++++++-------- dlls/wined3d/indexbuffer.c | 18 +++++++++--------- dlls/wined3d/resource.c | 40 ++++++++++++++++++++++++---------------- dlls/wined3d/surface.c | 2 +- dlls/wined3d/surface_base.c | 16 ++++++++-------- dlls/wined3d/surface_gdi.c | 2 +- dlls/wined3d/texture.c | 16 ++++++++-------- dlls/wined3d/vertexbuffer.c | 18 +++++++++--------- dlls/wined3d/volume.c | 18 +++++++++--------- dlls/wined3d/volumetexture.c | 16 ++++++++-------- dlls/wined3d/wined3d_private.h | 22 ++++++++++++---------- 12 files changed, 99 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2acf8d7947e4d39d96eab…

1 0

Jan de Mooij : shell32/autocomplete: Add unit tests for autocomplete.
by Alexandre Julliard Dec. 3, 2008

Dec. 3, 2008

Module: wine Branch: master Commit: 8c6495cc23c7bf89fecbcbfcdd169326f1dfd8c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c6495cc23c7bf89fecbcbfcd… Author: Jan de Mooij <jandemooij(a)gmail.com> Date: Tue Dec 2 17:57:45 2008 +0100 shell32/autocomplete: Add unit tests for autocomplete. --- dlls/shell32/tests/Makefile.in | 1 + dlls/shell32/tests/autocomplete.c | 122 +++++++++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/Makefile.in b/dlls/shell32/tests/Makefile.in index 4b1a140..0fc8d74 100644 --- a/dlls/shell32/tests/Makefile.in +++ b/dlls/shell32/tests/Makefile.in @@ -7,6 +7,7 @@ IMPORTS = shell32 ole32 oleaut32 user32 advapi32 kernel32 CTESTS = \ appbar.c \ + autocomplete.c \ generated.c \ shelllink.c \ shellpath.c \ diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c new file mode 100644 index 0000000..782fc35 --- /dev/null +++ b/dlls/shell32/tests/autocomplete.c @@ -0,0 +1,122 @@ +/* + * Tests for autocomplete + * + * Copyright 2008 Jan de Mooij + * + * 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 + */ + +#define COBJMACROS + +#include <wine/test.h> +#include <stdarg.h> + +#include "windows.h" +#include "shobjidl.h" +#include "shlguid.h" +#include "initguid.h" +#include "shldisp.h" + +static HWND hMainWnd, hEdit; +static HINSTANCE hinst; +static int killfocus_count; + +static void test_init(void) { + HRESULT r; + IAutoComplete* ac; + IUnknown *acSource; + + /* AutoComplete instance */ + r = CoCreateInstance(&CLSID_AutoComplete, NULL, CLSCTX_INPROC_SERVER, + &IID_IAutoComplete, (LPVOID*)&ac); + ok(SUCCEEDED(r), "no IID_IAutoComplete (0x%08x)\n", r); + + /* AutoComplete source */ + r = CoCreateInstance(&CLSID_ACLMulti, NULL, CLSCTX_INPROC_SERVER, + &IID_IACList, (LPVOID*)&acSource); + ok(SUCCEEDED(r), "no IID_IACList (0x%08x)\n", r); + + /* bind to edit control */ + r = IAutoComplete_Init(ac, hEdit, acSource, NULL, NULL); + ok(SUCCEEDED(r), "Init failed (0x%08x)\n", r); +} +static void test_killfocus(void) { + /* Test if WM_KILLFOCUS messages are handled properly by checking if + * the parent receives an EN_KILLFOCUS message. */ + SetFocus(hEdit); + killfocus_count = 0; + SetFocus(0); + ok(killfocus_count == 1, "Expected one EN_KILLFOCUS message, got: %d\n", killfocus_count); +} +static LRESULT CALLBACK MyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { + switch(msg) { + case WM_CREATE: + /* create edit control */ + hEdit = CreateWindowEx(0, "EDIT", "Some text", 0, 10, 10, 300, 300, + hWnd, NULL, hinst, NULL); + ok(hEdit != NULL, "Can't create edit control\n"); + break; + case WM_COMMAND: + if(HIWORD(wParam) == EN_KILLFOCUS) + killfocus_count++; + break; + } + return DefWindowProcA(hWnd, msg, wParam, lParam); +} +static void createMainWnd(void) { + WNDCLASSA wc; + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = GetModuleHandleA(NULL); + wc.hIcon = NULL; + wc.hCursor = LoadCursorA(NULL, IDC_IBEAM); + wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); + wc.lpszMenuName = NULL; + wc.lpszClassName = "MyTestWnd"; + wc.lpfnWndProc = MyWndProc; + RegisterClassA(&wc); + + hMainWnd = CreateWindowExA(0, "MyTestWnd", "Blah", WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, 130, 105, NULL, NULL, GetModuleHandleA(NULL), 0); +} +START_TEST(autocomplete) { + HRESULT r; + MSG msg; + + r = CoInitialize(NULL); + ok(SUCCEEDED(r), "CoInitialize failed (0x%08x). Tests aborted.\n", r); + if (FAILED(r)) + return; + + createMainWnd(); + + if(!ok(hMainWnd != NULL, "Failed to create parent window. Tests aborted.\n")) + return; + + test_init(); + test_killfocus(); + + PostQuitMessage(0); + while(GetMessageA(&msg,0,0,0)) { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + + DestroyWindow(hEdit); + DestroyWindow(hMainWnd); + + CoUninitialize(); +}

1 0

Henri Verbeet : wined3d: Rename basetexture functions to reflect that they' re not COM functions.
by Alexandre Julliard Dec. 3, 2008

Dec. 3, 2008

Module: wine Branch: master Commit: 4d60b6633c341c4e49e5056715a2e3e047eef5ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d60b6633c341c4e49e505671… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 2 18:41:32 2008 +0100 wined3d: Rename basetexture functions to reflect that they're not COM functions. --- dlls/wined3d/basetexture.c | 40 ++++++++++++++++++++++++++-------------- dlls/wined3d/cubetexture.c | 24 ++++++++++++------------ dlls/wined3d/texture.c | 24 ++++++++++++------------ dlls/wined3d/volumetexture.c | 24 ++++++++++++------------ dlls/wined3d/wined3d_private.h | 29 +++++++++++++++-------------- 5 files changed, 77 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d60b6633c341c4e49e50…

1 0

Jan de Mooij : shell32/autocomplete: Fix handling of WM_KILLFOCUS messages.
by Alexandre Julliard Dec. 3, 2008

Dec. 3, 2008

Module: wine Branch: master Commit: f1bf550c63cfce0fcbf630677a6141169f9761af URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1bf550c63cfce0fcbf630677… Author: Jan de Mooij <jandemooij(a)gmail.com> Date: Fri Nov 28 17:38:03 2008 +0100 shell32/autocomplete: Fix handling of WM_KILLFOCUS messages. --- dlls/shell32/autocomplete.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index fd1f1dd..2057b25 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -481,7 +481,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, { ShowWindow(This->hwndListBox, SW_HIDE); } - break; + return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); case WM_KEYUP: GetWindowTextW( hwnd, (LPWSTR)hwndText, 255);

1 0

Andrew Talbot : winemp3.acm: Sign-compare warnings fix.
by Alexandre Julliard Dec. 3, 2008

Dec. 3, 2008

Module: wine Branch: master Commit: c784eacfd33936c7320610475106d033b5f69ec7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c784eacfd33936c7320610475… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Dec 2 16:55:08 2008 +0000 winemp3.acm: Sign-compare warnings fix. --- dlls/winemp3.acm/layer3.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winemp3.acm/layer3.c b/dlls/winemp3.acm/layer3.c index 963fc96..4e8e42c 100644 --- a/dlls/winemp3.acm/layer3.c +++ b/dlls/winemp3.acm/layer3.c @@ -1837,7 +1837,7 @@ static void III_hybrid(real fsIn[SBLIMIT][SSLIMIT],real tsOut[SSLIMIT][SBLIMIT], int *blc = mp->hybrid_blc; real *rawout1,*rawout2; int bt; - int sb = 0; + unsigned int sb = 0; { int b = blc[ch]; @@ -1986,7 +1986,7 @@ int do_layer3(struct frame *fr,unsigned char *pcm_sample,int *pcm_point) switch(single) { case 3: { - register int i; + register unsigned int i; register real *in0 = (real *) hybridIn[0],*in1 = (real *) hybridIn[1]; for(i=0;i<SSLIMIT*gr_info->maxb;i++,in0++) *in0 = (*in0 + *in1++); /* *0.5 done by pow-scale */ @@ -1994,7 +1994,7 @@ int do_layer3(struct frame *fr,unsigned char *pcm_sample,int *pcm_point) break; case 1: { - register int i; + register unsigned int i; register real *in0 = (real *) hybridIn[0],*in1 = (real *) hybridIn[1]; for(i=0;i<SSLIMIT*gr_info->maxb;i++) *in0++ = *in1++;

1 0

Andrew Talbot : winedos: Sign-compare warning fix.
by Alexandre Julliard Dec. 3, 2008

Dec. 3, 2008

Module: wine Branch: master Commit: 3e8f6538c84ee1aab6d2cc929f3726198b7488b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e8f6538c84ee1aab6d2cc929… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Dec 2 16:55:04 2008 +0000 winedos: Sign-compare warning fix. --- dlls/winedos/timer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winedos/timer.c b/dlls/winedos/timer.c index 74e41b5..0a504af 100644 --- a/dlls/winedos/timer.c +++ b/dlls/winedos/timer.c @@ -99,7 +99,7 @@ static void CALLBACK TIMER_TimerProc( HWND hwnd, } else { - int i; + DWORD i; /* Calculate the number of valid timer interrupts we can generate */ DWORD count = delta / TIMER_millis;

1 0

Hans Leidekker : wininet: Stop leaking username and password.
by Alexandre Julliard Dec. 3, 2008

Dec. 3, 2008

Module: wine Branch: master Commit: 2ac52b0eeeed4d193c0262e1c59cfa822dce2fa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ac52b0eeeed4d193c0262e1c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 2 17:15:16 2008 +0100 wininet: Stop leaking username and password. --- dlls/wininet/http.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f9b0e5c..fad2e41 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3518,12 +3518,14 @@ static DWORD HTTPSESSION_SetOption(WININETHANDLEHEADER *hdr, DWORD option, void switch(option) { case INTERNET_OPTION_USERNAME: { - if (!(ses->lpszUserName = WININET_strdupW(buffer))) break; + HeapFree(GetProcessHeap(), 0, ses->lpszUserName); + if (!(ses->lpszUserName = WININET_strdupW(buffer))) return ERROR_OUTOFMEMORY; return ERROR_SUCCESS; } case INTERNET_OPTION_PASSWORD: { - if (!(ses->lpszPassword = WININET_strdupW(buffer))) break; + HeapFree(GetProcessHeap(), 0, ses->lpszPassword); + if (!(ses->lpszPassword = WININET_strdupW(buffer))) return ERROR_OUTOFMEMORY; return ERROR_SUCCESS; } default: break;

1 0

Hans Leidekker : wininet: Support setting username and password options on request handles.
by Alexandre Julliard Dec. 3, 2008

Dec. 3, 2008

Module: wine Branch: master Commit: a57cc6dcf63cf56ba18ec7de1a8b3add846c95b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a57cc6dcf63cf56ba18ec7de1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 2 17:15:07 2008 +0100 wininet: Support setting username and password options on request handles. --- dlls/wininet/http.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 9cb8985..f9b0e5c 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1617,6 +1617,16 @@ static DWORD HTTPREQ_SetOption(WININETHANDLEHEADER *hdr, DWORD option, void *buf return NETCON_set_timeout(&req->netConnection, option == INTERNET_OPTION_SEND_TIMEOUT, *(DWORD*)buffer); + + case INTERNET_OPTION_USERNAME: + HeapFree(GetProcessHeap(), 0, req->lpHttpSession->lpszUserName); + if (!(req->lpHttpSession->lpszUserName = WININET_strdupW(buffer))) return ERROR_OUTOFMEMORY; + return ERROR_SUCCESS; + + case INTERNET_OPTION_PASSWORD: + HeapFree(GetProcessHeap(), 0, req->lpHttpSession->lpszPassword); + if (!(req->lpHttpSession->lpszPassword = WININET_strdupW(buffer))) return ERROR_OUTOFMEMORY; + return ERROR_SUCCESS; } return ERROR_INTERNET_INVALID_OPTION;

1 0

Alexandre Julliard : oleaut32: Register interfaces through dlldata. c as far as possible.
by Alexandre Julliard Dec. 3, 2008

Dec. 3, 2008

Module: wine Branch: master Commit: 5a2c9de2e870b8dfeb7439a6b3926a41bab7d97f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a2c9de2e870b8dfeb7439a6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 2 21:20:32 2008 +0100 oleaut32: Register interfaces through dlldata.c as far as possible. --- dlls/oleaut32/Makefile.in | 2 +- dlls/oleaut32/oleaut.c | 16 +-- dlls/oleaut32/regsvr.c | 401 +++++++-------------------------------------- dlls/oleaut32/vartype.c | 6 +- 4 files changed, 63 insertions(+), 362 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a2c9de2e870b8dfeb743…

1 0