August 2006 - Wine-Commits - list.winehq.org

Robert Reif : winnt.h: Add missing define.
by Alexandre Julliard Aug. 3, 2006

Aug. 3, 2006

Module: wine Branch: refs/heads/master Commit: fc7f5b3364eeda5fbda43c322b04cab70379501c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fc7f5b3364eeda5fbda43c3… Author: Robert Reif <reif(a)earthlink.net> Date: Thu Aug 3 08:02:21 2006 -0400 winnt.h: Add missing define. --- include/winnt.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index c8eca8f..f212ddd 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3265,6 +3265,7 @@ #define SE_DACL_AUTO_INHERITED 0x000004 #define SE_SACL_AUTO_INHERITED 0x00000800 #define SE_DACL_PROTECTED 0x00001000 #define SE_SACL_PROTECTED 0x00002000 +#define SE_RM_CONTROL_VALID 0x00004000 #define SE_SELF_RELATIVE 0x00008000 typedef DWORD SECURITY_INFORMATION, *PSECURITY_INFORMATION;

1 0

Mike McCormack : ddraw: Don't link to wined3d, load it at runtime.
by Alexandre Julliard Aug. 3, 2006

Aug. 3, 2006

Module: wine Branch: refs/heads/master Commit: d99c7d59392f96de30f73328c0fe412b83d1b31e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d99c7d59392f96de30f7332… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Aug 3 14:30:00 2006 +0900 ddraw: Don't link to wined3d, load it at runtime. This lets ddraw dlls built on a machine with OpenGL present run on other machines that may not have the OpenGL libraries installed. --- dlls/ddraw/Makefile.in | 2 +- dlls/ddraw/main.c | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/Makefile.in b/dlls/ddraw/Makefile.in index 3e43491..6bbeb1e 100644 --- a/dlls/ddraw/Makefile.in +++ b/dlls/ddraw/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = ddraw.dll IMPORTLIB = libddraw.$(IMPLIBEXT) -IMPORTS = wined3d ole32 user32 gdi32 advapi32 kernel32 ntdll +IMPORTS = ole32 user32 gdi32 advapi32 kernel32 ntdll EXTRAINCL = @X_CFLAGS@ EXTRALIBS = -ldxguid -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index a9bec78..e654dd7 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -48,6 +48,11 @@ #include "d3d.h" #include "ddraw_private.h" +typedef IWineD3D* (WINAPI *fnWineDirect3DCreate)(UINT, UINT, IUnknown *); + +static HMODULE hWineD3D = (HMODULE) -1; +static fnWineDirect3DCreate pWineDirect3DCreate; + WINE_DEFAULT_DEBUG_CHANNEL(ddraw); /* The configured default surface */ @@ -149,13 +154,27 @@ DDRAW_Create(GUID *guid, This->orig_width = GetSystemMetrics(SM_CXSCREEN); This->orig_height = GetSystemMetrics(SM_CYSCREEN); + if (hWineD3D == (HMODULE) -1) + { + hWineD3D = LoadLibraryA("wined3d"); + if (hWineD3D) + pWineDirect3DCreate = (fnWineDirect3DCreate) GetProcAddress(hWineD3D, "WineDirect3DCreate"); + } + + if (!hWineD3D) + { + ERR("Couldn't load WineD3D - OpenGL libs not present?\n"); + hr = E_NOTIMPL; + goto err_out; + } + /* Initialize WineD3D * * All Rendering (2D and 3D) is relayed to WineD3D, * but DirectDraw specific management, like DDSURFACEDESC and DDPIXELFORMAT * structure handling is handled in this lib. */ - wineD3D = WineDirect3DCreate(0 /* SDKVersion */, 7 /* DXVersion */, (IUnknown *) This /* Parent */); + wineD3D = pWineDirect3DCreate(0 /* SDKVersion */, 7 /* DXVersion */, (IUnknown *) This /* Parent */); if(!wineD3D) { ERR("Failed to initialise WineD3D\n");

1 0

Hwang YunSong(황윤성) : notepad: Updated Korean resource.
by Alexandre Julliard Aug. 3, 2006

Aug. 3, 2006

Module: wine Branch: refs/heads/master Commit: e4dd34fe999a8044f444a8ca384243faf420c940 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e4dd34fe999a8044f444a8c… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Thu Aug 3 08:55:20 2006 +0900 notepad: Updated Korean resource. --- programs/notepad/Ko.rc | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/programs/notepad/Ko.rc b/programs/notepad/Ko.rc index 9372338..92b4c27 100644 --- a/programs/notepad/Ko.rc +++ b/programs/notepad/Ko.rc @@ -108,7 +108,7 @@ STRING_ERROR, STRING_WARNING, "��" STRING_INFO, "��" -STRING_UNTITLED, "(��)" +STRING_UNTITLED, "��" STRING_ALL_FILES, "�� (*.*)" STRING_TEXT_FILES_TXT, "�ؽ�Ʈ �� (*.txt)" @@ -126,3 +126,28 @@ STRING_OUT_OF_MEMORY, \n �ϳ�� Ǯ�׸�� ݾƼ� �� ޸𸮷�� ÷��ֽʽÿ�." } + + +STRINGTABLE DISCARDABLE LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT +{ +IDS_LICENSE_CAPTION, "��̼��" +IDS_LICENSE, +"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.\n\ +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.\n\ +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" + +IDS_WARRANTY_CAPTION, "�� " +IDS_WARRANTY, +"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." +}

1 0

Huw Davies : fonts: Add that extra pixel to the variants of 'e' too.
by Alexandre Julliard Aug. 3, 2006

Aug. 3, 2006

Module: wine Branch: refs/heads/master Commit: a1295177ade2fe77fac68c16a0637ce8fa12df92 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a1295177ade2fe77fac68c1… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 2 22:16:41 2006 +0100 fonts: Add that extra pixel to the variants of 'e' too. --- fonts/ms_sans_serif.sfd | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/fonts/ms_sans_serif.sfd b/fonts/ms_sans_serif.sfd index d12465f..14f6ed3 100644 --- a/fonts/ms_sans_serif.sfd +++ b/fonts/ms_sans_serif.sfd @@ -2283,17 +2283,17 @@ BDFChar: 166 228 6 1 5 0 8 BDFChar: 167 229 6 1 5 0 9 +Aa0\E!U]ELj/n" BDFChar: 168 230 10 1 9 0 5 -G5qo!IfP9)Lk'sT +G5qo!It3=TLk'sT BDFChar: 169 231 6 1 5 -2 5 E/9$pLi=J% BDFChar: 170 232 6 1 5 0 8 -5Tg&GM"#qNDu]k< +5Tg&GM"lLVDu]k< BDFChar: 171 233 6 1 5 0 8 -&0LslM"#qNDu]k< +&0LslM"lLVDu]k< BDFChar: 172 234 6 1 5 0 8 -+A`&WM"#qNDu]k< ++A`&WM"lLVDu]k< BDFChar: 173 235 6 1 5 0 8 -L]@EoM"#qNDu]k< +L]@EoM"lLVDu]k< BDFChar: 174 236 2 0 1 0 8 J3X*"5X7S"5QCca BDFChar: 175 237 4 2 3 0 8 @@ -2361,11 +2361,11 @@ #WrB;LkpkCGQ7^D BDFChar: 206 280 7 1 5 -2 8 pjdmFn:6%>p`M6j BDFChar: 207 281 6 1 5 -2 5 -E/="6Li=Ij +E/=:>Li=Ij BDFChar: 208 282 7 1 5 0 10 :a#O`J:R->J:RCp BDFChar: 209 283 6 1 5 0 8 -:`oaWM"#qNDu]k< +:`oaWM"lLVDu]k< BDFChar: 210 313 6 1 5 0 10 +@(I-J:N0#J:RCp BDFChar: 211 314 3 1 2 0 10 @@ -2403,7 +2403,7 @@ n:6%>J:IV" BDFChar: 227 1076 6 0 5 -1 5 GXt(a)r8Gn,@ BDFChar: 228 1077 6 1 5 0 5 -E/="6Li<=o +E/=:>Li<=o BDFChar: 229 1078 8 1 7 0 5 P#OD#<0(a)4] BDFChar: 230 1079 6 1 5 0 5 @@ -2651,7 +2651,7 @@ KE-[U`B^5LU]?[qMu\M2KE(uP BDFChar: 351 1025 7 1 5 0 10 :]U9(a)J:R->J:RCp BDFChar: 352 1105 6 1 5 0 7 -:]PHjn:6=6 +:]PHjpje0> EndBitmapFont BitmapFont: 16 354 13 3 1 FontForge BDFChar: 0 32 3 0 0 0 0

1 0

Thomas Kho : server: Remove unused thread_apc member.
by Alexandre Julliard Aug. 3, 2006

Aug. 3, 2006

Module: wine Branch: refs/heads/master Commit: 3538c0cdce81e1ee0861b0651da734aef14f0cfa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3538c0cdce81e1ee0861b06… Author: Thomas Kho <tkho(a)ucla.edu> Date: Wed Aug 2 19:41:02 2006 -0500 server: Remove unused thread_apc member. --- server/thread.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/server/thread.c b/server/thread.c index feb3259..60b74c9 100644 --- a/server/thread.c +++ b/server/thread.c @@ -72,7 +72,6 @@ struct thread_apc struct object *owner; /* object that queued this apc */ void *func; /* function to call in client */ enum apc_type type; /* type of apc function */ - int nb_args; /* number of arguments */ void *arg1; /* function arguments */ void *arg2; void *arg3;

1 0

Alexandre Julliard : riched20: Fixed handling of window private data for Win64.
by Alexandre Julliard Aug. 3, 2006

Aug. 3, 2006

Module: wine Branch: refs/heads/master Commit: 344389d6d5c9968018c6f591047a0802e46e9d54 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=344389d6d5c9968018c6f59… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 3 18:20:01 2006 +0200 riched20: Fixed handling of window private data for Win64. --- dlls/riched20/editor.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 5b42584..72a6a78 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1461,7 +1461,7 @@ LRESULT WINAPI RichEditANSIWndProc(HWND CREATESTRUCTW *pcs = (CREATESTRUCTW *)lParam; TRACE("WM_NCCREATE: style 0x%08lx\n", pcs->style); editor = ME_MakeEditor(hWnd); - SetWindowLongW(hWnd, 0, (long)editor); + SetWindowLongPtrW(hWnd, 0, (LONG_PTR)editor); pcs = 0; /* ignore */ return TRUE; } @@ -2234,7 +2234,7 @@ LRESULT WINAPI RichEditANSIWndProc(HWND return 0; case WM_DESTROY: ME_DestroyEditor(editor); - SetWindowLongW(hWnd, 0, 0); + SetWindowLongPtrW(hWnd, 0, 0); return 0; case WM_LBUTTONDOWN: SetFocus(hWnd); @@ -2530,7 +2530,7 @@ LRESULT WINAPI RichEdit10ANSIWndProc(HWN result = RichEditANSIWndProc(hWnd, msg, wParam, lParam); if (msg == WM_NCCREATE) { - ME_TextEditor *editor = (ME_TextEditor *)GetWindowLongW(hWnd, 0); + ME_TextEditor *editor = (ME_TextEditor *)GetWindowLongPtrW(hWnd, 0); editor->bEmulateVersion10 = TRUE; editor->pBuffer->pLast->member.para.nCharOfs = 2; @@ -2639,7 +2639,7 @@ void ME_RegisterEditorClass(HINSTANCE hI wcW.style = CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS; wcW.lpfnWndProc = RichEditANSIWndProc; wcW.cbClsExtra = 0; - wcW.cbWndExtra = 4; + wcW.cbWndExtra = sizeof(ME_TextEditor *); wcW.hInstance = NULL; /* hInstance would register DLL-local class */ wcW.hIcon = NULL; wcW.hCursor = LoadCursorW(NULL, MAKEINTRESOURCEW(IDC_IBEAM)); @@ -2655,7 +2655,7 @@ void ME_RegisterEditorClass(HINSTANCE hI wcA.style = CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS; wcA.lpfnWndProc = RichEditANSIWndProc; wcA.cbClsExtra = 0; - wcA.cbWndExtra = 4; + wcA.cbWndExtra = sizeof(ME_TextEditor *); wcA.hInstance = NULL; /* hInstance would register DLL-local class */ wcA.hIcon = NULL; wcA.hCursor = LoadCursorW(NULL, MAKEINTRESOURCEW(IDC_IBEAM));

1 0

Krzysztof Foltman : riched20: Handle incorrect calls of window procedure.
by Alexandre Julliard Aug. 3, 2006

Aug. 3, 2006

Module: wine Branch: refs/heads/master Commit: 6f15b54ade21c2c1cbf5a64692eb27c6173db706 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6f15b54ade21c2c1cbf5a64… Author: Krzysztof Foltman <wdev(a)foltman.com> Date: Wed Aug 2 22:54:03 2006 +0200 riched20: Handle incorrect calls of window procedure. --- dlls/riched20/editor.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 390ac3b..5b42584 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1060,6 +1060,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD n { CHARFORMAT2W chf; char buf[2048]; + chf.cbSize = sizeof(chf); ME_GetSelectionCharFormat(editor, &chf); ME_DumpStyleToBuf(&chf, buf); @@ -1393,11 +1394,16 @@ get_msg_name(UINT msg) */ LRESULT WINAPI RichEditANSIWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { SCROLLINFO si; - ME_TextEditor *editor = (ME_TextEditor *)GetWindowLongW(hWnd, 0); + ME_TextEditor *editor = (ME_TextEditor *)GetWindowLongPtrW(hWnd, 0); TRACE("hWnd %p msg %04x (%s) %08x %08lx\n", hWnd, msg, get_msg_name(msg), wParam, lParam); + if (!editor && msg != WM_NCCREATE && msg != WM_NCDESTROY) { + ERR("RichEditANSIWndProc called with invalid hWnd %p - application bug?\n", hWnd); + return 0; + } + switch(msg) { UNSUPPORTED_MSG(EM_DISPLAYBAND)

1 0

Robert Reif : advapi32: Check returned data from LsaQueryInformationPolicy.
by Alexandre Julliard Aug. 2, 2006

Aug. 2, 2006

Module: wine Branch: refs/heads/master Commit: dabf5e88bf481c973344b809f5f93723a98dc402 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dabf5e88bf481c973344b80… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Aug 1 22:33:18 2006 -0400 advapi32: Check returned data from LsaQueryInformationPolicy. --- dlls/advapi32/tests/Makefile.in | 1 + dlls/advapi32/tests/lsa.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/Makefile.in b/dlls/advapi32/tests/Makefile.in index 4c7739c..875b0c7 100644 --- a/dlls/advapi32/tests/Makefile.in +++ b/dlls/advapi32/tests/Makefile.in @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = advapi32.dll IMPORTS = advapi32 kernel32 +EXTRALIBS = -luuid CTESTS = \ crypt.c \ diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 47144b0..da357ce 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -28,7 +28,8 @@ #include "winbase.h" #include "winreg.h" #include "winternl.h" #include "ntsecapi.h" - +#define INITGUID +#include "guiddef.h" #include "wine/test.h" static HMODULE hadvapi32; @@ -80,6 +81,7 @@ static void test_lsa(void) status = pLsaQueryInformationPolicy(handle, PolicyPrimaryDomainInformation, (PVOID*)&primary_domain_info); ok(status == STATUS_SUCCESS, "LsaQueryInformationPolicy(PolicyPrimaryDomainInformation) failed, returned 0x%08lx\n", status); if (status == STATUS_SUCCESS) { + ok(primary_domain_info->Sid==0,"Sid should be NULL on the local computer\n"); pLsaFreeMemory((LPVOID)primary_domain_info); } @@ -92,6 +94,8 @@ static void test_lsa(void) status = pLsaQueryInformationPolicy(handle, PolicyDnsDomainInformation, (PVOID*)&dns_domain_info); ok(status == STATUS_SUCCESS, "LsaQueryInformationPolicy(PolicyDnsDomainInformation) failed, returned 0x%08lx\n", status); if (status == STATUS_SUCCESS) { + ok(IsEqualGUID(&dns_domain_info->DomainGuid, &GUID_NULL), "DomainGUID should be GUID_NULL on local computer\n"); + ok(dns_domain_info->Sid==0,"Sid should be NULL on the local computer\n"); pLsaFreeMemory((LPVOID)dns_domain_info); }

1 0

Andrew Talbot : msi/tests: Write-strings warnings fix.
by Alexandre Julliard Aug. 2, 2006

Aug. 2, 2006

Module: wine Branch: refs/heads/master Commit: 72ac6f5d4e034c8aa5631fb825223e083adfa450 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=72ac6f5d4e034c8aa5631fb… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Aug 2 19:34:26 2006 +0100 msi/tests: Write-strings warnings fix. --- dlls/msi/tests/db.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index e68f2a2..6c6ddfc 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -717,7 +717,7 @@ static UINT get_columns_table_type(MSIHA return type; } -static BOOL check_record( MSIHANDLE rec, UINT field, LPSTR val ) +static BOOL check_record( MSIHANDLE rec, UINT field, LPCSTR val ) { CHAR buffer[0x20]; UINT r;

1 0

Andrew Talbot : lz32/tests: Write-strings warning fix.
by Alexandre Julliard Aug. 2, 2006

Aug. 2, 2006

Module: wine Branch: refs/heads/master Commit: 369ac64afe0f45385913bcb1f330a2980c8a4fb8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=369ac64afe0f45385913bcb… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Aug 2 18:19:51 2006 +0100 lz32/tests: Write-strings warning fix. --- dlls/lz32/tests/lzexpand_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c index 05704ce..fe1ae83 100644 --- a/dlls/lz32/tests/lzexpand_main.c +++ b/dlls/lz32/tests/lzexpand_main.c @@ -62,10 +62,11 @@ static void test_LZOpenFileA(void) INT file; char expected[MAX_PATH]; char filled_0xA5[OFS_MAXPATHNAME]; + static char badfilename_[] = "badfilename_"; SetLastError(0xfaceabee); /* Check for nonexistent file. */ - file = LZOpenFileA("badfilename_", &test, OF_READ); + file = LZOpenFileA(badfilename_, &test, OF_READ); ok(file == LZERROR_BADINHANDLE, "LZOpenFileA succeeded on nonexistent file\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND,

1 0