wine-commits May 2009

wine-commits@winehq.org

4 participants
793 discussions

Austin English : user32: Downgrade a FIXME to a WARN.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 5f2a3d8467dc48883547d2d2e52a7b3b4d5d50c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f2a3d8467dc48883547d2d2e… Author: Austin English <austinenglish(a)gmail.com> Date: Wed May 27 23:21:50 2009 -0500 user32: Downgrade a FIXME to a WARN. --- dlls/user32/hook.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 0b0d7c4..b6dc8e8 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -891,6 +891,7 @@ void WINAPI NotifyWinEvent(DWORD event, HWND hwnd, LONG object_id, LONG child_id */ BOOL WINAPI IsWinEventHookInstalled(DWORD dwEvent) { - FIXME("(%d)-stub!\n", dwEvent); + /* FIXME: Needed by Office 2007 installer */ + WARN("(%d)-stub!\n", dwEvent); return TRUE; }

1 0

Henri Verbeet : wined3d: Remove the "declaration" parameter to IWineD3DDeviceImpl_CreateVertexShader().
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 13a05caa9744673d618bc00426f3bf21e72aa0b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13a05caa9744673d618bc0042… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 28 08:44:21 2009 +0200 wined3d: Remove the "declaration" parameter to IWineD3DDeviceImpl_CreateVertexShader(). Once upon a time this was used for creating fake vertex shader attribute semantics for d3d8 shaders. We don't need this anymore since device_stream_info_from_declaration() will use the vertex declaration's output slot to load the data, if present. That also avoids the potentially expensive matching of attribute semantics between vertex shader and declaration for d3d8. --- dlls/d3d10core/device.c | 2 +- dlls/d3d8/device.c | 7 ++----- dlls/d3d9/vertexshader.c | 2 +- dlls/wined3d/device.c | 7 +------ dlls/wined3d/vertexshader.c | 28 ---------------------------- include/wine/wined3d.idl | 4 ---- 6 files changed, 5 insertions(+), 45 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index de07db7..20e7c46 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1003,7 +1003,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateVertexShader(ID3D10Device *i return hr; } - hr = IWineD3DDevice_CreateVertexShader(This->wined3d_device, NULL, + hr = IWineD3DDevice_CreateVertexShader(This->wined3d_device, shader_info.shader_code, &object->output_signature, &object->wined3d_shader, (IUnknown *)object); if (FAILED(hr)) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 4b24ac8..6af8d1e 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1726,7 +1726,6 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexShader(LPDIRECT3DDEVICE8 IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hrc = D3D_OK; IDirect3DVertexShader8Impl *object; - IWineD3DVertexDeclaration *wined3d_vertex_declaration; const DWORD *token = pDeclaration; DWORD handle; @@ -1783,13 +1782,11 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexShader(LPDIRECT3DDEVICE8 *ppShader = ((IDirect3DVertexDeclaration8Impl *)object->vertex_declaration)->shader_handle = shader_handle; } - wined3d_vertex_declaration = ((IDirect3DVertexDeclaration8Impl *)object->vertex_declaration)->wined3d_vertex_declaration; - if (pFunction) { /* Usage is missing ... Use SetRenderState to set the sw vp render state in SetVertexShader */ - hrc = IWineD3DDevice_CreateVertexShader(This->WineD3DDevice, wined3d_vertex_declaration, - pFunction, NULL /* output signature */, &object->wineD3DVertexShader, (IUnknown *)object); + hrc = IWineD3DDevice_CreateVertexShader(This->WineD3DDevice, pFunction, + NULL /* output signature */, &object->wineD3DVertexShader, (IUnknown *)object); if (FAILED(hrc)) { diff --git a/dlls/d3d9/vertexshader.c b/dlls/d3d9/vertexshader.c index c138690..d7b680e 100644 --- a/dlls/d3d9/vertexshader.c +++ b/dlls/d3d9/vertexshader.c @@ -126,7 +126,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexShader(LPDIRECT3DDEVICE9EX iface object->ref = 1; object->lpVtbl = &Direct3DVertexShader9_Vtbl; EnterCriticalSection(&d3d9_cs); - hrc= IWineD3DDevice_CreateVertexShader(This->WineD3DDevice, NULL /* declaration */, pFunction, + hrc= IWineD3DDevice_CreateVertexShader(This->WineD3DDevice, pFunction, NULL /* output signature */, &object->wineD3DVertexShader, (IUnknown *)object); LeaveCriticalSection(&d3d9_cs); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 91a0266..b022755 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2329,8 +2329,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexDeclarationFromFVF(IWineD3D } static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexShader(IWineD3DDevice *iface, - IWineD3DVertexDeclaration *vertex_declaration, const DWORD *pFunction, - const struct wined3d_shader_signature *output_signature, + const DWORD *pFunction, const struct wined3d_shader_signature *output_signature, IWineD3DVertexShader **ppVertexShader, IUnknown *parent) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; @@ -2355,10 +2354,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexShader(IWineD3DDevice *ifac TRACE("(%p) : Created vertex shader %p\n", This, *ppVertexShader); - if (vertex_declaration) { - IWineD3DVertexShader_FakeSemantics(*ppVertexShader, vertex_declaration); - } - hr = IWineD3DVertexShader_SetFunction(*ppVertexShader, pFunction, output_signature); if (FAILED(hr)) { diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index b8c56cc..99108a8 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -105,20 +105,6 @@ static void vshader_set_limits(IWineD3DVertexShaderImpl *This) } } -/* This is an internal function, - * used to create fake semantics for shaders - * that don't have them - d3d8 shaders where the declaration - * stores the register for each input - */ -static void vshader_set_input( - IWineD3DVertexShaderImpl* This, - unsigned int regnum, - BYTE usage, BYTE usage_idx) { - - This->attributes[regnum].usage = usage; - This->attributes[regnum].usage_idx = usage_idx; -} - static BOOL match_usage(BYTE usage1, BYTE usage_idx1, BYTE usage2, BYTE usage_idx2) { if (usage_idx1 != usage_idx2) return FALSE; if (usage1 == usage2) return TRUE; @@ -320,19 +306,6 @@ static HRESULT WINAPI IWineD3DVertexShaderImpl_SetFunction(IWineD3DVertexShader return WINED3D_OK; } -/* Preload semantics for d3d8 shaders */ -static void WINAPI IWineD3DVertexShaderImpl_FakeSemantics(IWineD3DVertexShader *iface, IWineD3DVertexDeclaration *vertex_declaration) { - IWineD3DVertexShaderImpl *This =(IWineD3DVertexShaderImpl *)iface; - IWineD3DVertexDeclarationImpl* vdecl = (IWineD3DVertexDeclarationImpl*)vertex_declaration; - - unsigned int i; - for (i = 0; i < vdecl->element_count; ++i) - { - const struct wined3d_vertex_declaration_element *e = &vdecl->elements[i]; - vshader_set_input(This, e->output_slot, e->usage, e->usage_idx); - } -} - /* Set local constants for d3d8 shaders */ static HRESULT WINAPI IWIneD3DVertexShaderImpl_SetLocalConstantsF(IWineD3DVertexShader *iface, UINT start_idx, const float *src_data, UINT count) { @@ -389,7 +362,6 @@ const IWineD3DVertexShaderVtbl IWineD3DVertexShader_Vtbl = /*** IWineD3DVertexShader methods ***/ IWineD3DVertexShaderImpl_GetDevice, IWineD3DVertexShaderImpl_GetFunction, - IWineD3DVertexShaderImpl_FakeSemantics, IWIneD3DVertexShaderImpl_SetLocalConstantsF }; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 7c875e4..48938cb 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2868,9 +2868,6 @@ interface IWineD3DVertexShader : IWineD3DBaseShader [out] void *data, [in, out] UINT *data_size ); - void FakeSemantics( - [in] IWineD3DVertexDeclaration *vertex_declaration - ); HRESULT SetLocalConstantsF( [in] UINT start_idx, [in] const float *src_data, @@ -3011,7 +3008,6 @@ interface IWineD3DDevice : IWineD3DBase [in] DWORD fvf ); HRESULT CreateVertexShader( - [in] IWineD3DVertexDeclaration *declaration, [in] const DWORD *function, [in] const struct wined3d_shader_signature *output_signature, [out] IWineD3DVertexShader **shader,

1 0

Henri Verbeet : d3d10core: Don' t complain as much about setting a NULL geometry shader.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 71382b5cbbd2bbf8eedbe54e644113fc00f2cde2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71382b5cbbd2bbf8eedbe54e6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 28 08:44:21 2009 +0200 d3d10core: Don't complain as much about setting a NULL geometry shader. Setting a NULL geometry shader doesn't hurt much, and it reduces console spam a bit. --- dlls/d3d10core/device.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 15e0184..de07db7 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -236,7 +236,8 @@ static void STDMETHODCALLTYPE d3d10_device_GSSetConstantBuffers(ID3D10Device *if static void STDMETHODCALLTYPE d3d10_device_GSSetShader(ID3D10Device *iface, ID3D10GeometryShader *shader) { - FIXME("iface %p, shader %p stub!\n", iface, shader); + if (shader) FIXME("iface %p, shader %p stub!\n", iface, shader); + else WARN("iface %p, shader %p stub!\n", iface, shader); } static void STDMETHODCALLTYPE d3d10_device_IASetPrimitiveTopology(ID3D10Device *iface, D3D10_PRIMITIVE_TOPOLOGY topology)

1 0

Henri Verbeet : d3d10core: Implement ID3D10Device::VSSetShader().
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 057513cf6696b461c89685737afd00f5bee831c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=057513cf6696b461c89685737… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 28 08:44:21 2009 +0200 d3d10core: Implement ID3D10Device::VSSetShader(). --- dlls/d3d10core/device.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index ce18eb7..15e0184 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -141,7 +141,12 @@ static void STDMETHODCALLTYPE d3d10_device_PSSetSamplers(ID3D10Device *iface, static void STDMETHODCALLTYPE d3d10_device_VSSetShader(ID3D10Device *iface, ID3D10VertexShader *shader) { - FIXME("iface %p, shader %p stub!\n", iface, shader); + struct d3d10_device *This = (struct d3d10_device *)iface; + struct d3d10_vertex_shader *vs = (struct d3d10_vertex_shader *)shader; + + TRACE("iface %p, shader %p\n", iface, shader); + + IWineD3DDevice_SetVertexShader(This->wined3d_device, vs ? vs->wined3d_shader : NULL); } static void STDMETHODCALLTYPE d3d10_device_DrawIndexed(ID3D10Device *iface,

1 0

Henri Verbeet : wined3d: Match the d3d10 name for WINED3DDECLUSAGE_POSITION .
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: fcf7844653368f70d175e1fd90f99742accc65eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcf7844653368f70d175e1fd9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 28 08:44:21 2009 +0200 wined3d: Match the d3d10 name for WINED3DDECLUSAGE_POSITION. I.e., make sure that if a SM4 shader uses SV_POSITION it ends up as position data. --- dlls/wined3d/baseshader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index c5f364c..dbbca56 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -345,7 +345,7 @@ static const char *shader_semantic_name_from_usage(WINED3DDECLUSAGE usage) { static const char *semantic_names[] = { - /* WINED3DDECLUSAGE_POSITION */ "POSITION", + /* WINED3DDECLUSAGE_POSITION */ "SV_POSITION", /* WINED3DDECLUSAGE_BLENDWEIGHT */ "BLENDWEIGHT", /* WINED3DDECLUSAGE_BLENDINDICES */ "BLENDINDICES", /* WINED3DDECLUSAGE_NORMAL */ "NORMAL",

1 0

Henri Verbeet : wined3d: Use the output signature to setup SM4 vertex shader output semantics.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 3925cd5f15c25a20e0f729fbc359e518c53e5c41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3925cd5f15c25a20e0f729fbc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 28 08:44:21 2009 +0200 wined3d: Use the output signature to setup SM4 vertex shader output semantics. --- dlls/wined3d/vertexshader.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 681ec35..b8c56cc 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -246,6 +246,7 @@ static HRESULT WINAPI IWineD3DVertexShaderImpl_SetFunction(IWineD3DVertexShader IWineD3DVertexShaderImpl *This =(IWineD3DVertexShaderImpl *)iface; IWineD3DDeviceImpl *deviceImpl = (IWineD3DDeviceImpl *) This->baseShader.device; const struct wined3d_shader_frontend *fe; + unsigned int i; HRESULT hr; shader_reg_maps *reg_maps = &This->baseShader.reg_maps; @@ -281,6 +282,16 @@ static HRESULT WINAPI IWineD3DVertexShaderImpl_SetFunction(IWineD3DVertexShader pFunction, GL_LIMITS(vshader_constantsF)); if (hr != WINED3D_OK) return hr; + if (output_signature) + { + for (i = 0; i < output_signature->element_count; ++i) + { + struct wined3d_shader_signature_element *e = &output_signature->elements[i]; + reg_maps->output_registers |= 1 << e->register_idx; + This->output_signature[e->register_idx] = *e; + } + } + vshader_set_limits(This); if(deviceImpl->vs_selected_mode == SHADER_ARB &&

1 0

Dmitry Timoshkov : winex11.drv: Avoid a crash if not in a desktop mode.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 2fdbeefc9693fe4af2ec9b9581311442f141633e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fdbeefc9693fe4af2ec9b958… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu May 28 15:00:10 2009 +0900 winex11.drv: Avoid a crash if not in a desktop mode. --- dlls/winex11.drv/desktop.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 5b96e33..a2bc004 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -137,6 +137,8 @@ Window CDECL X11DRV_create_desktop( UINT width, UINT height ) Window win; Display *display = thread_init_display(); + TRACE( "%u x %u\n", width, height ); + wine_tsx11_lock(); /* Create window */ @@ -206,7 +208,7 @@ static void update_desktop_fullscreen( unsigned int width, unsigned int height) Display *display = thread_display(); XEvent xev; - wine_tsx11_lock(); + if (!display || root_window != DefaultRootWindow( display )) return; xev.xclient.type = ClientMessage; xev.xclient.window = root_window; @@ -225,9 +227,9 @@ static void update_desktop_fullscreen( unsigned int width, unsigned int height) TRACE("action=%li\n", xev.xclient.data.l[0]); + wine_tsx11_lock(); XSendEvent( display, DefaultRootWindow(display), False, SubstructureRedirectMask | SubstructureNotifyMask, &xev ); - wine_tsx11_unlock(); }

1 0

Michael Stefaniuc : notepad: Use the ARRAY_SIZE() macro if we already have it.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 129889b2872c7ab98485b6550e711cf1f1a8e145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=129889b2872c7ab98485b6550… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 27 23:49:13 2009 +0200 notepad: Use the ARRAY_SIZE() macro if we already have it. --- programs/notepad/dialog.c | 2 +- programs/notepad/main.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index 761705b..d7354e7 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -257,7 +257,7 @@ void DoOpenFile(LPCWSTR szFileName) SetFocus(Globals.hEdit); /* If the file starts with .LOG, add a time/date at the end and set cursor after */ - if (GetWindowTextW(Globals.hEdit, log, sizeof(log)/sizeof(log[0])) && !lstrcmpW(log, dotlog)) + if (GetWindowTextW(Globals.hEdit, log, ARRAY_SIZE(log)) && !lstrcmpW(log, dotlog)) { static const WCHAR lfW[] = { '\r','\n',0 }; SendMessageW(Globals.hEdit, EM_SETSEL, GetWindowTextLengthW(Globals.hEdit), -1); diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 57018ce..c195668 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -203,10 +203,10 @@ static VOID NOTEPAD_LoadSettingFromRegistry(void) Globals.lfFont.lfPitchAndFamily = FIXED_PITCH | FF_DONTCARE; lstrcpyW(Globals.lfFont.lfFaceName, systemW); - LoadStringW(Globals.hInstance, STRING_PAGESETUP_HEADERVALUE, Globals.szHeader, - sizeof(Globals.szHeader) / sizeof(Globals.szHeader[0])); - LoadStringW(Globals.hInstance, STRING_PAGESETUP_FOOTERVALUE, Globals.szFooter, - sizeof(Globals.szFooter) / sizeof(Globals.szFooter[0])); + LoadStringW(Globals.hInstance, STRING_PAGESETUP_HEADERVALUE, + Globals.szHeader, ARRAY_SIZE(Globals.szHeader)); + LoadStringW(Globals.hInstance, STRING_PAGESETUP_FOOTERVALUE, + Globals.szFooter, ARRAY_SIZE(Globals.szFooter)); if(RegOpenKeyW(HKEY_CURRENT_USER, notepad_reg_key, &hkey) == ERROR_SUCCESS) {

1 0

Michael Stefaniuc : notepad: Rename the SIZEOF macro to the more descriptive ARRAY_SIZE.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: cdc5b0c29b2ba3c76c9fdf4fe71eca9ea4e71b86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdc5b0c29b2ba3c76c9fdf4fe… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 27 23:48:57 2009 +0200 notepad: Rename the SIZEOF macro to the more descriptive ARRAY_SIZE. SIZEOF looks just like one of the typical Win32 API capitalizations of the basic C construct which it isn't. --- programs/notepad/dialog.c | 36 ++++++++++++++++++------------------ programs/notepad/main.c | 6 +++--- programs/notepad/main.h | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index 4e56d8e..761705b 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -45,7 +45,7 @@ VOID ShowLastError(void) LPWSTR lpMsgBuf; WCHAR szTitle[MAX_STRING_LEN]; - LoadStringW(Globals.hInstance, STRING_ERROR, szTitle, SIZEOF(szTitle)); + LoadStringW(Globals.hInstance, STRING_ERROR, szTitle, ARRAY_SIZE(szTitle)); FormatMessageW( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, error, 0, (LPWSTR)&lpMsgBuf, 0, NULL); @@ -68,9 +68,9 @@ static void UpdateWindowCaption(void) if (Globals.szFileTitle[0] != '\0') lstrcpyW(szCaption, Globals.szFileTitle); else - LoadStringW(Globals.hInstance, STRING_UNTITLED, szCaption, SIZEOF(szCaption)); + LoadStringW(Globals.hInstance, STRING_UNTITLED, szCaption, ARRAY_SIZE(szCaption)); - LoadStringW(Globals.hInstance, STRING_NOTEPAD, szNotepad, SIZEOF(szNotepad)); + LoadStringW(Globals.hInstance, STRING_NOTEPAD, szNotepad, ARRAY_SIZE(szNotepad)); lstrcatW(szCaption, hyphenW); lstrcatW(szCaption, szNotepad); @@ -83,14 +83,14 @@ int DIALOG_StringMsgBox(HWND hParent, int formatId, LPCWSTR szString, DWORD dwFl WCHAR szResource[MAX_STRING_LEN]; /* Load and format szMessage */ - LoadStringW(Globals.hInstance, formatId, szResource, SIZEOF(szResource)); - wnsprintfW(szMessage, SIZEOF(szMessage), szResource, szString); + LoadStringW(Globals.hInstance, formatId, szResource, ARRAY_SIZE(szResource)); + wnsprintfW(szMessage, ARRAY_SIZE(szMessage), szResource, szString); /* Load szCaption */ if ((dwFlags & MB_ICONMASK) == MB_ICONEXCLAMATION) - LoadStringW(Globals.hInstance, STRING_ERROR, szResource, SIZEOF(szResource)); + LoadStringW(Globals.hInstance, STRING_ERROR, szResource, ARRAY_SIZE(szResource)); else - LoadStringW(Globals.hInstance, STRING_NOTEPAD, szResource, SIZEOF(szResource)); + LoadStringW(Globals.hInstance, STRING_NOTEPAD, szResource, ARRAY_SIZE(szResource)); /* Display Modal Dialog */ if (hParent == NULL) @@ -107,7 +107,7 @@ static int AlertFileNotSaved(LPCWSTR szFileName) { WCHAR szUntitled[MAX_STRING_LEN]; - LoadStringW(Globals.hInstance, STRING_UNTITLED, szUntitled, SIZEOF(szUntitled)); + LoadStringW(Globals.hInstance, STRING_UNTITLED, szUntitled, ARRAY_SIZE(szUntitled)); return DIALOG_StringMsgBox(NULL, STRING_NOTSAVED, szFileName[0] ? szFileName : szUntitled, MB_ICONQUESTION|MB_YESNOCANCEL); } @@ -292,7 +292,7 @@ VOID DIALOG_FileOpen(VOID) ZeroMemory(&openfilename, sizeof(openfilename)); - GetCurrentDirectoryW(SIZEOF(szDir), szDir); + GetCurrentDirectoryW(ARRAY_SIZE(szDir), szDir); lstrcpyW(szPath, txt_files); openfilename.lStructSize = sizeof(openfilename); @@ -300,7 +300,7 @@ VOID DIALOG_FileOpen(VOID) openfilename.hInstance = Globals.hInstance; openfilename.lpstrFilter = Globals.szFilter; openfilename.lpstrFile = szPath; - openfilename.nMaxFile = SIZEOF(szPath); + openfilename.nMaxFile = ARRAY_SIZE(szPath); openfilename.lpstrInitialDir = szDir; openfilename.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_ENABLESIZING; @@ -331,7 +331,7 @@ BOOL DIALOG_FileSaveAs(VOID) ZeroMemory(&saveas, sizeof(saveas)); - GetCurrentDirectoryW(SIZEOF(szDir), szDir); + GetCurrentDirectoryW(ARRAY_SIZE(szDir), szDir); lstrcpyW(szPath, txt_files); saveas.lStructSize = sizeof(OPENFILENAMEW); @@ -339,7 +339,7 @@ BOOL DIALOG_FileSaveAs(VOID) saveas.hInstance = Globals.hInstance; saveas.lpstrFilter = Globals.szFilter; saveas.lpstrFile = szPath; - saveas.nMaxFile = SIZEOF(szPath); + saveas.nMaxFile = ARRAY_SIZE(szPath); saveas.lpstrInitialDir = szDir; saveas.Flags = OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY | OFN_ENABLESIZING; @@ -733,7 +733,7 @@ VOID DIALOG_Search(VOID) Globals.find.hwndOwner = Globals.hMainWnd; Globals.find.hInstance = Globals.hInstance; Globals.find.lpstrFindWhat = Globals.szFindText; - Globals.find.wFindWhatLen = SIZEOF(Globals.szFindText); + Globals.find.wFindWhatLen = ARRAY_SIZE(Globals.szFindText); Globals.find.Flags = FR_DOWN|FR_HIDEWHOLEWORD; /* We only need to create the modal FindReplace dialog which will */ @@ -765,9 +765,9 @@ VOID DIALOG_Replace(VOID) Globals.find.hwndOwner = Globals.hMainWnd; Globals.find.hInstance = Globals.hInstance; Globals.find.lpstrFindWhat = Globals.szFindText; - Globals.find.wFindWhatLen = SIZEOF(Globals.szFindText); + Globals.find.wFindWhatLen = ARRAY_SIZE(Globals.szFindText); Globals.find.lpstrReplaceWith = Globals.szReplaceText; - Globals.find.wReplaceWithLen = SIZEOF(Globals.szReplaceText); + Globals.find.wReplaceWithLen = ARRAY_SIZE(Globals.szReplaceText); Globals.find.Flags = FR_DOWN|FR_HIDEWHOLEWORD; /* We only need to create the modal FindReplace dialog which will */ @@ -799,7 +799,7 @@ VOID DIALOG_HelpAboutNotepad(VOID) HICON icon = LoadImageW(Globals.hInstance, MAKEINTRESOURCEW(IDI_NOTEPAD), IMAGE_ICON, 48, 48, LR_SHARED); - LoadStringW(Globals.hInstance, STRING_NOTEPAD, szNotepad, SIZEOF(szNotepad)); + LoadStringW(Globals.hInstance, STRING_NOTEPAD, szNotepad, ARRAY_SIZE(szNotepad)); ShellAboutW(Globals.hMainWnd, szNotepad, notepadW, icon); } @@ -830,8 +830,8 @@ static INT_PTR WINAPI DIALOG_PAGESETUP_DlgProc(HWND hDlg, UINT msg, WPARAM wPara { case IDOK: /* save user input and close dialog */ - GetDlgItemTextW(hDlg, IDC_PAGESETUP_HEADERVALUE, Globals.szHeader, SIZEOF(Globals.szHeader)); - GetDlgItemTextW(hDlg, IDC_PAGESETUP_FOOTERVALUE, Globals.szFooter, SIZEOF(Globals.szFooter)); + GetDlgItemTextW(hDlg, IDC_PAGESETUP_HEADERVALUE, Globals.szHeader, ARRAY_SIZE(Globals.szHeader)); + GetDlgItemTextW(hDlg, IDC_PAGESETUP_FOOTERVALUE, Globals.szFooter, ARRAY_SIZE(Globals.szFooter)); Globals.iMarginTop = GetDlgItemInt(hDlg, IDC_PAGESETUP_TOPVALUE, NULL, FALSE) * 100; Globals.iMarginBottom = GetDlgItemInt(hDlg, IDC_PAGESETUP_BOTTOMVALUE, NULL, FALSE) * 100; diff --git a/programs/notepad/main.c b/programs/notepad/main.c index b3c5411..57018ce 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -576,7 +576,7 @@ static LRESULT WINAPI NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam, WCHAR szFileName[MAX_PATH]; HANDLE hDrop = (HANDLE) wParam; - DragQueryFileW(hDrop, 0, szFileName, SIZEOF(szFileName)); + DragQueryFileW(hDrop, 0, szFileName, ARRAY_SIZE(szFileName)); DragFinish(hDrop); DoOpenFile(szFileName); break; @@ -598,10 +598,10 @@ static int AlertFileDoesNotExist(LPCWSTR szFileName) WCHAR szMessage[MAX_STRING_LEN]; WCHAR szResource[MAX_STRING_LEN]; - LoadStringW(Globals.hInstance, STRING_DOESNOTEXIST, szResource, SIZEOF(szResource)); + LoadStringW(Globals.hInstance, STRING_DOESNOTEXIST, szResource, ARRAY_SIZE(szResource)); wsprintfW(szMessage, szResource, szFileName); - LoadStringW(Globals.hInstance, STRING_ERROR, szResource, SIZEOF(szResource)); + LoadStringW(Globals.hInstance, STRING_ERROR, szResource, ARRAY_SIZE(szResource)); nResult = MessageBoxW(Globals.hMainWnd, szMessage, szResource, MB_ICONEXCLAMATION | MB_YESNO); diff --git a/programs/notepad/main.h b/programs/notepad/main.h index 69c31af..f81c437 100644 --- a/programs/notepad/main.h +++ b/programs/notepad/main.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define SIZEOF(a) sizeof(a)/sizeof((a)[0]) +#define ARRAY_SIZE(a) sizeof(a)/sizeof((a)[0]) #include "notepad_res.h"

1 0

Andrew Talbot : comctl32: Constify some variables.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: bfe3c6430b227433150f4ae41454ccd4201d19e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfe3c6430b227433150f4ae41… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed May 27 22:17:32 2009 +0100 comctl32: Constify some variables. --- dlls/comctl32/comboex.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 04464fd..8a0652c 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -356,7 +356,7 @@ static void COMBOEX_GetComboFontSize (COMBOEX_INFO *infoPtr, SIZE *size) } -static void COMBOEX_CopyItem (CBE_ITEMDATA *item, COMBOBOXEXITEMW *cit) +static void COMBOEX_CopyItem (const CBE_ITEMDATA *item, COMBOBOXEXITEMW *cit) { if (cit->mask & CBEIF_TEXT) { /* @@ -467,7 +467,7 @@ static void COMBOEX_SetEditText (COMBOEX_INFO *infoPtr, CBE_ITEMDATA *item) } -static CBE_ITEMDATA * COMBOEX_FindItem(COMBOEX_INFO *infoPtr, INT_PTR index) +static CBE_ITEMDATA * COMBOEX_FindItem(const COMBOEX_INFO *infoPtr, INT_PTR index) { CBE_ITEMDATA *item; INT i; @@ -542,7 +542,7 @@ static INT COMBOEX_DeleteItem (COMBOEX_INFO *infoPtr, INT_PTR index) } -static BOOL COMBOEX_GetItemW (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW *cit) +static BOOL COMBOEX_GetItemW (const COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW *cit) { INT_PTR index = cit->iItem; CBE_ITEMDATA *item; @@ -563,7 +563,7 @@ static BOOL COMBOEX_GetItemW (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW *cit) } -static BOOL COMBOEX_GetItemA (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA *cit) +static BOOL COMBOEX_GetItemA (const COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA *cit) { COMBOBOXEXITEMW tmpcit;

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
80
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 May 2009