May 2009 - Wine-commits - list.winehq.org

Hwang YunSong : notepad: Updated Korean resource.
by Alexandre Julliard 08 May '09

08 May '09

Module: wine Branch: master Commit: bcf1361af11d3a6ea4726a98aa95c2c9abd03fd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcf1361af11d3a6ea4726a98a… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon May 4 10:29:05 2009 +0900 notepad: Updated Korean resource. --- programs/notepad/Ko.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Ko.rc b/programs/notepad/Ko.rc index 045a13c..3b4e5d4 100644 --- a/programs/notepad/Ko.rc +++ b/programs/notepad/Ko.rc @@ -5,6 +5,7 @@ * Proofread 1998 by David Lee Lambert <lamber45(a)egr.msu.edu> * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> * Copyright 2007 Bang Jun-Young <junyoung(a)mogua.com> + * Copyright 2009 YunSong Hwang <hys545(a)dreamwiz.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -54,6 +55,7 @@ POPUP " POPUP "ã��(&S)" { MENUITEM "ã��(&S)...\tCtrl+F", CMD_SEARCH MENUITEM "�� ã��(&N)\tF3", CMD_SEARCH_NEXT + MENUITEM "�ٲٱ�(&R)...\tCtrl+H", CMD_REPLACE } POPUP "��(&H)" { MENUITEM "�׸�(&C)", CMD_HELP_CONTENTS

1 0

Henri Verbeet : wined3d: Group register information into struct wined3d_shader_register.
by Alexandre Julliard 08 May '09

08 May '09

Module: wine Branch: master Commit: 5e473cb17f69d60a506e96e6ffb3467f3e4f48b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e473cb17f69d60a506e96e6f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 7 16:36:07 2009 +0200 wined3d: Group register information into struct wined3d_shader_register. --- dlls/wined3d/arb_program_shader.c | 116 ++++++++++++++++++------------------ dlls/wined3d/baseshader.c | 58 +++++++++--------- dlls/wined3d/glsl_shader.c | 95 ++++++++++++++++--------------- dlls/wined3d/shader_sm1.c | 12 ++-- dlls/wined3d/shader_sm4.c | 24 ++++---- dlls/wined3d/vertexshader.c | 6 +- dlls/wined3d/wined3d_private.h | 19 ++++--- 7 files changed, 168 insertions(+), 162 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5e473cb17f69d60a506e9…

1 0

Henri Verbeet : wined3d: Fix shader_glsl_get_register_name() indentation.
by Alexandre Julliard 08 May '09

08 May '09

Module: wine Branch: master Commit: 448dc84b6eb39f6f33d7c45ec2446a53221cd9af URL: http://source.winehq.org/git/wine.git/?a=commit;h=448dc84b6eb39f6f33d7c45ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 7 16:36:07 2009 +0200 wined3d: Fix shader_glsl_get_register_name() indentation. --- dlls/wined3d/glsl_shader.c | 279 ++++++++++++++++++++++---------------------- 1 files changed, 142 insertions(+), 137 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=448dc84b6eb39f6f33d7c…

1 0

Henri Verbeet : wined3d: Pass a struct wined3d_shader_register to shader_glsl_get_register_name().
by Alexandre Julliard 08 May '09

08 May '09

Module: wine Branch: master Commit: 4a18697246f3111ef95930fadf7cf8fffeb5e048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a18697246f3111ef95930fad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 7 16:36:08 2009 +0200 wined3d: Pass a struct wined3d_shader_register to shader_glsl_get_register_name(). --- dlls/wined3d/glsl_shader.c | 78 +++++++++++++++++++++----------------------- 1 files changed, 37 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a18697246f3111ef9593…

1 0

Henri Verbeet : wined3d: Pass a struct wined3d_shader_register to shader_is_scalar().
by Alexandre Julliard 08 May '09

08 May '09

Module: wine Branch: master Commit: 96005c0fcaeecf97c55c2b1fa0504aa011681d2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=96005c0fcaeecf97c55c2b1fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 7 16:36:08 2009 +0200 wined3d: Pass a struct wined3d_shader_register to shader_is_scalar(). --- dlls/wined3d/glsl_shader.c | 6 +++--- dlls/wined3d/wined3d_private.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3be9422..92be8dc 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1242,7 +1242,7 @@ static DWORD shader_glsl_get_write_mask(const struct wined3d_shader_dst_param *p { DWORD mask = param->write_mask; - if (shader_is_scalar(param->reg.type, param->reg.idx)) + if (shader_is_scalar(&param->reg)) { mask = WINED3DSP_WRITEMASK_0; *write_mask = '\0'; @@ -1285,7 +1285,7 @@ static void shader_glsl_swizzle_to_str(const DWORD swizzle, BOOL fixup, DWORD ma static void shader_glsl_get_swizzle(const struct wined3d_shader_src_param *param, BOOL fixup, DWORD mask, char *swizzle_str) { - if (shader_is_scalar(param->reg.type, param->reg.idx)) + if (shader_is_scalar(&param->reg)) *swizzle_str = '\0'; else shader_glsl_swizzle_to_str(param->swizzle, fixup, mask, swizzle_str); @@ -1970,7 +1970,7 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) char mask_char[6]; BOOL temp_destination = FALSE; - if (shader_is_scalar(ins->src[0].reg.type, ins->src[0].reg.idx)) + if (shader_is_scalar(&ins->src[0].reg)) { write_mask = shader_glsl_append_dst(ins->ctx->buffer, ins); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8bda76a..2b63364 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2594,13 +2594,13 @@ static inline BOOL shader_is_vshader_version(enum wined3d_shader_type type) return type == WINED3D_SHADER_TYPE_VERTEX; } -static inline BOOL shader_is_scalar(WINED3DSHADER_PARAM_REGISTER_TYPE register_type, UINT register_idx) +static inline BOOL shader_is_scalar(const struct wined3d_shader_register *reg) { - switch (register_type) + switch (reg->type) { case WINED3DSPR_RASTOUT: /* oFog & oPts */ - if (register_idx != 0) return TRUE; + if (reg->idx != 0) return TRUE; /* oPos */ return FALSE; @@ -2611,7 +2611,7 @@ static inline BOOL shader_is_scalar(WINED3DSHADER_PARAM_REGISTER_TYPE register_t return TRUE; case WINED3DSPR_MISCTYPE: - switch(register_idx) + switch(reg->idx) { case 0: /* vPos */ return FALSE;

1 0

Henri Verbeet : wined3d: Add support for immediate constants to the GLSL backend.
by Alexandre Julliard 08 May '09

08 May '09

Module: wine Branch: master Commit: 69cbb57bfde091039b30050cee8d17374b1da58f URL: http://source.winehq.org/git/wine.git/?a=commit;h=69cbb57bfde091039b30050ce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 7 16:36:08 2009 +0200 wined3d: Add support for immediate constants to the GLSL backend. --- dlls/wined3d/glsl_shader.c | 19 +++++++++++++++++++ dlls/wined3d/wined3d_private.h | 9 +++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 92be8dc..0370fde 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1220,6 +1220,25 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * } break; + case WINED3DSPR_IMMCONST: + switch (reg->immconst_type) + { + case WINED3D_IMMCONST_FLOAT: + sprintf(register_name, "%.8e", *(float *)reg->immconst_data); + break; + + case WINED3D_IMMCONST_FLOAT4: + sprintf(register_name, "vec4(%.8e, %.8e, %.8e, %.8e)", + *(float *)&reg->immconst_data[0], *(float *)&reg->immconst_data[1], + *(float *)&reg->immconst_data[2], *(float *)&reg->immconst_data[3]); + break; + + default: + FIXME("Unhandled immconst type %#x\n", reg->immconst_type); + sprintf(register_name, "<unhandled_immconst_type %#x>", reg->immconst_type); + } + break; + default: FIXME("Unhandled register name Type(%d)\n", reg->type); sprintf(register_name, "unrecognized_register"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2b63364..c5f74fb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2621,6 +2621,15 @@ static inline BOOL shader_is_scalar(const struct wined3d_shader_register *reg) return FALSE; } + case WINED3DSPR_IMMCONST: + switch(reg->immconst_type) + { + case WINED3D_IMMCONST_FLOAT: + return TRUE; + default: + return FALSE; + } + default: return FALSE; }

1 0

Alexandre Julliard : ntdll: Fix the LPC_MESSAGE structure definition for 64-bit.
by Alexandre Julliard 07 May '09

07 May '09

Module: wine Branch: master Commit: 82fb611806b37be7959723670889835e1b9d554f URL: http://source.winehq.org/git/wine.git/?a=commit;h=82fb611806b37be7959723670… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 7 13:42:39 2009 +0200 ntdll: Fix the LPC_MESSAGE structure definition for 64-bit. --- dlls/ntdll/nt.c | 4 ++-- dlls/ntdll/tests/port.c | 4 ++-- include/winternl.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 8ffa9e0..58320c3 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -691,8 +691,8 @@ NTSTATUS WINAPI NtRequestWaitReplyPort( TRACE("\tVirtualRangesOffset = %u\n",pLpcMessageIn->VirtualRangesOffset); TRACE("\tClientId.UniqueProcess = %p\n",pLpcMessageIn->ClientId.UniqueProcess); TRACE("\tClientId.UniqueThread = %p\n",pLpcMessageIn->ClientId.UniqueThread); - TRACE("\tMessageId = %u\n",pLpcMessageIn->MessageId); - TRACE("\tSectionSize = %u\n",pLpcMessageIn->SectionSize); + TRACE("\tMessageId = %lu\n",pLpcMessageIn->MessageId); + TRACE("\tSectionSize = %lu\n",pLpcMessageIn->SectionSize); TRACE("\tData = %s\n", debugstr_an((const char*)pLpcMessageIn->Data,pLpcMessageIn->DataSize)); } diff --git a/dlls/ntdll/tests/port.c b/dlls/ntdll/tests/port.c index 51707e3..0795b4c 100644 --- a/dlls/ntdll/tests/port.c +++ b/dlls/ntdll/tests/port.c @@ -62,8 +62,8 @@ typedef struct _LPC_MESSAGE USHORT MessageType; USHORT VirtualRangesOffset; CLIENT_ID ClientId; - ULONG MessageId; - ULONG SectionSize; + ULONG_PTR MessageId; + ULONG_PTR SectionSize; UCHAR Data[ANYSIZE_ARRAY]; } LPC_MESSAGE, *PLPC_MESSAGE; diff --git a/include/winternl.h b/include/winternl.h index 5ebbca5..b06a10c 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1803,8 +1803,8 @@ typedef struct _LPC_MESSAGE { USHORT MessageType; USHORT VirtualRangesOffset; CLIENT_ID ClientId; - ULONG MessageId; - ULONG SectionSize; + ULONG_PTR MessageId; + ULONG_PTR SectionSize; UCHAR Data[ANYSIZE_ARRAY]; } LPC_MESSAGE, *PLPC_MESSAGE;

1 0

Alexandre Julliard : user32/tests: Fix the window creation on Win64.
by Alexandre Julliard 07 May '09

07 May '09

Module: wine Branch: master Commit: 8432ff70bb898867d1fa6cdda3aeb6ddf4c45144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8432ff70bb898867d1fa6cdda… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 7 13:50:49 2009 +0200 user32/tests: Fix the window creation on Win64. --- dlls/user32/tests/class.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index f3e8242..f8a4cd8 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -43,11 +43,13 @@ static const WCHAR WC_EDITW[] = {'E','d','i','t',0}; static LRESULT WINAPI ClassTest_WndProc (HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { + if (msg == WM_NCCREATE) return 1; return DefWindowProcW (hWnd, msg, wParam, lParam); } static LRESULT WINAPI ClassTest_WndProc2 (HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { + if (msg == WM_NCCREATE) return 1; return DefWindowProcA (hWnd, msg, wParam, lParam); } @@ -370,6 +372,7 @@ static void test_instances(void) /* setting global flag doesn't change status of class */ hwnd = CreateWindowExA( 0, name, "test", 0, 0, 0, 0, 0, 0, 0, main_module, 0 ); + ok( hwnd != 0, "CreateWindow failed error %u\n", GetLastError()); SetClassLongA( hwnd, GCL_STYLE, CS_GLOBALCLASS ); cls.lpszMenuName = "kernel32"; cls.hInstance = kernel32;

1 0

Giuseppe Bilotta : comctl32/toolbar: Skip iString field for separators.
by Alexandre Julliard 07 May '09

07 May '09

Module: wine Branch: master Commit: fcc9b57c7aee38fa9d47ed55b7e274188cdb76f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcc9b57c7aee38fa9d47ed55b… Author: Giuseppe Bilotta <giuseppe.bilotta(a)gmail.com> Date: Thu May 7 11:13:15 2009 +0200 comctl32/toolbar: Skip iString field for separators. --- dlls/comctl32/toolbar.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index c3add77..c5aa8f4 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -1841,7 +1841,9 @@ TOOLBAR_InternalInsertButtonsT(TOOLBAR_INFO *infoPtr, INT iIndex, UINT nAddButto btnPtr->fsState = lpTbb[iButton].fsState; btnPtr->fsStyle = lpTbb[iButton].fsStyle; btnPtr->dwData = lpTbb[iButton].dwData; - if(HIWORD(lpTbb[iButton].iString) && lpTbb[iButton].iString != -1) + if (btnPtr->fsStyle & BTNS_SEP) + btnPtr->iString = -1; + else if(HIWORD(lpTbb[iButton].iString) && lpTbb[iButton].iString != -1) { if (fUnicode) Str_SetPtrW((LPWSTR*)&btnPtr->iString, (LPWSTR)lpTbb[iButton].iString );

1 0

Giuseppe Bilotta : comctl32/toolbar: When a null lParam is passed to TB_GETBUTTONTEXTA, we should not return -1 but the string size.
by Alexandre Julliard 07 May '09

07 May '09

Module: wine Branch: master Commit: 585c3abb6b9ab2ab558e6c963e7fb0cbf339ede2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=585c3abb6b9ab2ab558e6c963… Author: Giuseppe Bilotta <giuseppe.bilotta(a)gmail.com> Date: Thu May 7 11:13:16 2009 +0200 comctl32/toolbar: When a null lParam is passed to TB_GETBUTTONTEXTA, we should not return -1 but the string size. --- dlls/comctl32/toolbar.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index c5aa8f4..867bac8 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3435,9 +3435,6 @@ TOOLBAR_GetButtonTextA (HWND hwnd, WPARAM wParam, LPARAM lParam) INT nIndex; LPWSTR lpText; - if (lParam == 0) - return -1; - nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam, FALSE); if (nIndex == -1) return -1; @@ -3445,7 +3442,7 @@ TOOLBAR_GetButtonTextA (HWND hwnd, WPARAM wParam, LPARAM lParam) lpText = TOOLBAR_GetText(infoPtr,&infoPtr->buttons[nIndex]); return WideCharToMultiByte( CP_ACP, 0, lpText, -1, - (LPSTR)lParam, 0x7fffffff, NULL, NULL ) - 1; + (LPSTR)lParam, lParam ? 0x7fffffff : 0, NULL, NULL ) - 1; }

1 0