June 2012 - Wine-Commits - list.winehq.org

Ken Thomases : winex11: Fix correspondence between main_key_LT_B and main_key_vkey_qwerty.
by Alexandre Julliard June 12, 2012

June 12, 2012

Module: wine Branch: master Commit: 51d5a48c370eee01ea17565aa3a885646d0045d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51d5a48c370eee01ea17565aa… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jun 11 17:49:36 2012 -0500 winex11: Fix correspondence between main_key_LT_B and main_key_vkey_qwerty. --- dlls/winex11.drv/keyboard.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index a2237e2..955ddfb 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -758,9 +758,9 @@ static const char main_key_LA[MAIN_LEN][4] = /*** Lithuanian keyboard layout (setxkbmap lt) */ static const char main_key_LT_B[MAIN_LEN][4] = { - "`~","��","��","��","��","��","��","��","��","�(","�)","-_","��","\\|", + "`~","��","��","��","��","��","��","��","��","�(","�)","-_","��", "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","[{","]}", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL",";:","'\"", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL",";:","'\"","\\|", "zZ","xX","cC","vV","bB","nN","mM",",<",".>","/?", "��" };

1 0

Francois Gouget : d3drm: Move up the IDirect3DRM{Frame, Light, Visual}Array implementations to avoid forward declarations.
by Alexandre Julliard June 12, 2012

June 12, 2012

Module: wine Branch: master Commit: 86a2fcf6145e1c66df5ffeed269ae45621c4934b URL: http://source.winehq.org/git/wine.git/?a=commit;h=86a2fcf6145e1c66df5ffeed2… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 12 10:23:23 2012 +0200 d3drm: Move up the IDirect3DRM{Frame,Light,Visual}Array implementations to avoid forward declarations. --- dlls/d3drm/frame.c | 1116 ++++++++++++++++++++++++++-------------------------- 1 files changed, 556 insertions(+), 560 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=86a2fcf6145e1c66df5ff…

1 0

Francois Gouget : d3drm: Make Direct3DRM{Frame, Light, Visual}Array_create() static.
by Alexandre Julliard June 12, 2012

June 12, 2012

Module: wine Branch: master Commit: 04f19989d05860926ad2cf8dfe1f890db3e8ad01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04f19989d05860926ad2cf8df… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 12 10:23:37 2012 +0200 d3drm: Make Direct3DRM{Frame,Light,Visual}Array_create() static. --- dlls/d3drm/frame.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index dbbc1dd..26ebaf3 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -193,7 +193,7 @@ static const struct IDirect3DRMFrameArrayVtbl Direct3DRMFrameArray_Vtbl = IDirect3DRMFrameArrayImpl_GetElement }; -HRESULT Direct3DRMFrameArray_create(IDirect3DRMFrameArray** obj) +static HRESULT Direct3DRMFrameArray_create(IDirect3DRMFrameArray** obj) { IDirect3DRMFrameArrayImpl* object; @@ -309,7 +309,7 @@ static const struct IDirect3DRMVisualArrayVtbl Direct3DRMVisualArray_Vtbl = IDirect3DRMVisualArrayImpl_GetElement }; -HRESULT Direct3DRMVisualArray_create(IDirect3DRMVisualArray** ret_iface) +static HRESULT Direct3DRMVisualArray_create(IDirect3DRMVisualArray** ret_iface) { IDirect3DRMVisualArrayImpl* object; @@ -429,7 +429,7 @@ static const struct IDirect3DRMLightArrayVtbl Direct3DRMLightArray_Vtbl = IDirect3DRMLightArrayImpl_GetElement }; -HRESULT Direct3DRMLightArray_create(IDirect3DRMLightArray** obj) +static HRESULT Direct3DRMLightArray_create(IDirect3DRMLightArray** obj) { IDirect3DRMLightArrayImpl* object;

1 0

Francois Gouget : wined3d: Reorder some surface functions to avoid the need for forward declarations.
by Alexandre Julliard June 12, 2012

June 12, 2012

Module: wine Branch: master Commit: 9a874aca8e3b93b0aa5e2ec61e672a5cb7a81fa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a874aca8e3b93b0aa5e2ec61… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 12 10:24:06 2012 +0200 wined3d: Reorder some surface functions to avoid the need for forward declarations. --- dlls/wined3d/surface.c | 418 ++++++++++++++++++++++++------------------------ 1 files changed, 209 insertions(+), 209 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a874aca8e3b93b0aa5e2…

1 0

Francois Gouget : wined3d: Make some surface functions static.
by Alexandre Julliard June 12, 2012

June 12, 2012

Module: wine Branch: master Commit: 4f17081652ca3022d77543d0ceef080847342511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f17081652ca3022d77543d0c… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 12 10:24:18 2012 +0200 wined3d: Make some surface functions static. --- dlls/wined3d/surface.c | 6 +++--- dlls/wined3d/wined3d_private.h | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 890d0de..e479486 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -591,7 +591,7 @@ static void surface_evict_sysmem(struct wined3d_surface *surface) } /* Context activation is done by the caller. */ -void surface_bind(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) +static void surface_bind(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) { TRACE("surface %p, context %p, srgb %#x.\n", surface, context, srgb); @@ -1795,7 +1795,7 @@ static void surface_remove_pbo(struct wined3d_surface *surface, const struct win surface->flags &= ~SFLAG_PBO; } -BOOL surface_init_sysmem(struct wined3d_surface *surface) +static BOOL surface_init_sysmem(struct wined3d_surface *surface) { if (!surface->resource.allocatedMemory) { @@ -2392,7 +2392,7 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi } } -HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_alpha_ck, BOOL use_texturing, +static HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_alpha_ck, BOOL use_texturing, struct wined3d_format *format, enum wined3d_conversion_type *conversion_type) { BOOL colorkey_active = need_alpha_ck && (surface->CKeyFlags & WINEDDSD_CKSRCBLT); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6632f6e..4b5176d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2085,11 +2085,9 @@ static inline GLuint surface_get_texture_name(const struct wined3d_surface *surf } void surface_add_dirty_rect(struct wined3d_surface *surface, const struct wined3d_box *dirty_rect) DECLSPEC_HIDDEN; -void surface_bind(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const struct wined3d_color *color) DECLSPEC_HIDDEN; GLenum surface_get_gl_buffer(const struct wined3d_surface *surface) DECLSPEC_HIDDEN; -BOOL surface_init_sysmem(struct wined3d_surface *surface) DECLSPEC_HIDDEN; void surface_internal_preload(struct wined3d_surface *surface, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN; BOOL surface_is_offscreen(const struct wined3d_surface *surface) DECLSPEC_HIDDEN; HRESULT surface_load(struct wined3d_surface *surface, BOOL srgb) DECLSPEC_HIDDEN; @@ -2182,8 +2180,6 @@ enum wined3d_conversion_type WINED3D_CT_CK_ARGB32, }; -HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_alpha_ck, BOOL use_texturing, - struct wined3d_format *format, enum wined3d_conversion_type *conversion_type) DECLSPEC_HIDDEN; void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[256][4], BOOL colorkey) DECLSPEC_HIDDEN; struct wined3d_vertex_declaration_element

1 0

Francois Gouget : user32: Reorder some DDE functions to avoid the need for forward declarations.
by Alexandre Julliard June 12, 2012

June 12, 2012

Module: wine Branch: master Commit: 31d432925cbbcaaf320a2c2ce0c41f36f2e3ac95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31d432925cbbcaaf320a2c2ce… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 12 10:24:45 2012 +0200 user32: Reorder some DDE functions to avoid the need for forward declarations. --- dlls/user32/dde_misc.c | 2052 ++++++++++++++++++++++++------------------------ 1 files changed, 1029 insertions(+), 1023 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=31d432925cbbcaaf320a2…

1 0

Francois Gouget : user32: Make some DDE functions static.
by Alexandre Julliard June 12, 2012

June 12, 2012

Module: wine Branch: master Commit: 12b900ce70778d29b362d0cbf2cd31149aefb548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12b900ce70778d29b362d0cbf… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 12 10:25:03 2012 +0200 user32: Make some DDE functions static. --- dlls/user32/dde_misc.c | 10 +++++----- dlls/user32/dde_private.h | 5 ----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c index d8a43ec..35b9599 100644 --- a/dlls/user32/dde_misc.c +++ b/dlls/user32/dde_misc.c @@ -429,7 +429,7 @@ BOOL WDML_DecHSZ(WDML_INSTANCE* pInstance, HSZ hsz) * Frees up all the strings still allocated in the list and * remove all the nodes from the list of HSZ nodes. */ -void WDML_FreeAllHSZ(WDML_INSTANCE* pInstance) +static void WDML_FreeAllHSZ(WDML_INSTANCE* pInstance) { /* Free any strings created in this instance. */ @@ -837,8 +837,8 @@ static LRESULT CALLBACK WDML_EventProc(HWND hwndEvent, UINT uMsg, WPARAM wParam, * * */ -UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback, - DWORD afCmd, DWORD ulRes, BOOL bUnicode) +static UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback, + DWORD afCmd, DWORD ulRes, BOOL bUnicode) { WDML_INSTANCE* pInstance; WDML_INSTANCE* reference_inst; @@ -1832,7 +1832,7 @@ void WDML_RemoveLink(WDML_INSTANCE* pInstance, HCONV hConv, WDML_SIDE side, * * */ -void WDML_RemoveAllLinks(WDML_INSTANCE* pInstance, WDML_CONV* pConv, WDML_SIDE side) +static void WDML_RemoveAllLinks(WDML_INSTANCE* pInstance, WDML_CONV* pConv, WDML_SIDE side) { WDML_LINK* pPrev = NULL; WDML_LINK* pCurrent = NULL; @@ -1994,7 +1994,7 @@ void WDML_FreeTransaction(WDML_INSTANCE* pInstance, WDML_XACT* pXAct, BOOL doFre * * */ -WDML_XACT* WDML_FindTransaction(WDML_CONV* pConv, DWORD tid) +static WDML_XACT* WDML_FindTransaction(WDML_CONV* pConv, DWORD tid) { WDML_XACT* pXAct; diff --git a/dlls/user32/dde_private.h b/dlls/user32/dde_private.h index a6da664..bdd0949 100644 --- a/dlls/user32/dde_private.h +++ b/dlls/user32/dde_private.h @@ -196,8 +196,6 @@ extern WDML_QUEUE_STATE WDML_ServerHandle(WDML_CONV* pConv, WDML_XACT* pXAct) DE /* transaction handler on the client side */ HDDEDATA WDML_ClientHandle(WDML_CONV *pConv, WDML_XACT *pXAct, DWORD dwTimeout, LPDWORD pdwResult) DECLSPEC_HIDDEN; /* called both in DdeClientTransaction and server side. */ -extern UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback, - DWORD afCmd, DWORD ulRes, BOOL bUnicode) DECLSPEC_HIDDEN; extern WDML_CONV* WDML_AddConv(WDML_INSTANCE* pInstance, WDML_SIDE side, HSZ hszService, HSZ hszTopic, HWND hwndClient, HWND hwndServer) DECLSPEC_HIDDEN; extern void WDML_RemoveConv(WDML_CONV* pConv, WDML_SIDE side) DECLSPEC_HIDDEN; @@ -213,9 +211,7 @@ extern WDML_LINK* WDML_FindLink(WDML_INSTANCE* pInstance, HCONV hConv, WDML_SIDE HSZ hszItem, BOOL use_fmt, UINT uFmt) DECLSPEC_HIDDEN; extern void WDML_RemoveLink(WDML_INSTANCE* pInstance, HCONV hConv, WDML_SIDE side, HSZ hszItem, UINT wFmt) DECLSPEC_HIDDEN; -extern void WDML_RemoveAllLinks(WDML_INSTANCE* pInstance, WDML_CONV* pConv, WDML_SIDE side) DECLSPEC_HIDDEN; /* string internals */ -extern void WDML_FreeAllHSZ(WDML_INSTANCE* pInstance) DECLSPEC_HIDDEN; extern BOOL WDML_DecHSZ(WDML_INSTANCE* pInstance, HSZ hsz) DECLSPEC_HIDDEN; extern BOOL WDML_IncHSZ(WDML_INSTANCE* pInstance, HSZ hsz) DECLSPEC_HIDDEN; extern ATOM WDML_MakeAtomFromHsz(HSZ hsz) DECLSPEC_HIDDEN; @@ -225,7 +221,6 @@ extern WDML_XACT* WDML_AllocTransaction(WDML_INSTANCE* pInstance, UINT ddeMsg, U extern void WDML_QueueTransaction(WDML_CONV* pConv, WDML_XACT* pXAct) DECLSPEC_HIDDEN; extern BOOL WDML_UnQueueTransaction(WDML_CONV* pConv, WDML_XACT* pXAct) DECLSPEC_HIDDEN; extern void WDML_FreeTransaction(WDML_INSTANCE* pInstance, WDML_XACT* pXAct, BOOL doFreePmt) DECLSPEC_HIDDEN; -extern WDML_XACT* WDML_FindTransaction(WDML_CONV* pConv, DWORD tid) DECLSPEC_HIDDEN; extern HGLOBAL WDML_DataHandle2Global(HDDEDATA hDdeData, BOOL fResponse, BOOL fRelease, BOOL fDeferUpd, BOOL dAckReq) DECLSPEC_HIDDEN; extern HDDEDATA WDML_Global2DataHandle(WDML_CONV* pConv, HGLOBAL hMem, WINE_DDEHEAD* da) DECLSPEC_HIDDEN;

1 0

Francois Gouget : joy.cpl: Make list_dlgproc() static.
by Alexandre Julliard June 12, 2012

June 12, 2012

Module: wine Branch: master Commit: 6d15b88897c6cf4178baf89dd975111789c51d2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d15b88897c6cf4178baf89dd… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 12 10:25:27 2012 +0200 joy.cpl: Make list_dlgproc() static. --- dlls/joy.cpl/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 2882575..a58d768 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -126,7 +126,7 @@ static void destroy_joysticks(struct JoystickData *data) * list_dlgproc [internal] * */ -INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { TRACE("(%p, 0x%08x/%d, 0x%lx)\n", hwnd, msg, msg, lparam); switch (msg)

1 0

Francois Gouget : mmdevapi: Make MMDevice_GetPropValue() static.
by Alexandre Julliard June 12, 2012

June 12, 2012

Module: wine Branch: master Commit: 4a27f7bf27e85f16a26952ef88ad1f5a0e6c593a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a27f7bf27e85f16a26952ef8… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 12 10:25:59 2012 +0200 mmdevapi: Make MMDevice_GetPropValue() static. --- dlls/mmdevapi/devenum.c | 2 +- dlls/mmdevapi/mmdevapi.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 075313c..6ec847d 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -151,7 +151,7 @@ static HRESULT MMDevPropStore_OpenPropKey(const GUID *guid, DWORD flow, HKEY *pr return S_OK; } -HRESULT MMDevice_GetPropValue(const GUID *devguid, DWORD flow, REFPROPERTYKEY key, PROPVARIANT *pv) +static HRESULT MMDevice_GetPropValue(const GUID *devguid, DWORD flow, REFPROPERTYKEY key, PROPVARIANT *pv) { WCHAR buffer[80]; const GUID *id = &key->fmtid; diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h index 09bb307..c511240 100644 --- a/dlls/mmdevapi/mmdevapi.h +++ b/dlls/mmdevapi/mmdevapi.h @@ -23,7 +23,6 @@ extern HRESULT MMDevEnum_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN; extern void MMDevEnum_Free(void) DECLSPEC_HIDDEN; -extern HRESULT MMDevice_GetPropValue(const GUID *devguid, DWORD flow, REFPROPERTYKEY key, PROPVARIANT *pv) DECLSPEC_HIDDEN; /* Changes to this enum must be synced in drivers. */ enum _DriverPriority {

1 0

Francois Gouget : gdiplus: Make get_font_hfont() static.
by Alexandre Julliard June 12, 2012

June 12, 2012

Module: wine Branch: master Commit: 15846adef078c84c2d2cca54f9addfc1b9a2dcb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15846adef078c84c2d2cca54f… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 12 10:26:17 2012 +0200 gdiplus: Make get_font_hfont() static. --- dlls/gdiplus/gdiplus_private.h | 2 -- dlls/gdiplus/graphics.c | 2 +- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 753a162..322fb02 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -63,8 +63,6 @@ extern void calc_curve_bezier_endp(REAL xend, REAL yend, REAL xadj, REAL yadj, extern void free_installed_fonts(void) DECLSPEC_HIDDEN; -extern void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, HFONT *hfont) DECLSPEC_HIDDEN; - extern BOOL lengthen_path(GpPath *path, INT len) DECLSPEC_HIDDEN; extern GpStatus trace_path(GpGraphics *graphics, GpPath *path) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c6e6a6e..2e3d0b5 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2113,7 +2113,7 @@ end: return stat; } -void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, HFONT *hfont) +static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, HFONT *hfont) { HDC hdc = CreateCompatibleDC(0); GpPointF pt[3];

1 0