September 2006 - Wine-Commits

lostwages/wwn wn20060919_320.xml
by WineHQ Sept. 19, 2006

Sept. 19, 2006

ChangeSet ID: 28091 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/09/19 12:34:35 Modified files: wwn : wn20060919_320.xml Log message: Fix malformed XML Patch: http://cvs.winehq.org/patch.py?id=28091 Old revision New revision Changes Path 1.1 1.2 +3 -3 lostwages/wwn/wn20060919_320.xml Index: lostwages/wwn/wn20060919_320.xml diff -u -p lostwages/wwn/wn20060919_320.xml:1.1 lostwages/wwn/wn20060919_320.xml:1.2 --- lostwages/wwn/wn20060919_320.xml:1.1 19 Sep 2006 17:34:35 -0000 +++ lostwages/wwn/wn20060919_320.xml 19 Sep 2006 17:34:35 -0000 @@ -26,7 +26,7 @@ href="http://www.winehq.org">www.winehq. enddate="09/18/2005" > <topic>WineConf 2006</topic> - +<p> <a href="/images/wineconf06_grp.jpg"><img src="/images/wineconf06_grp_thmb.jpg" align="right" /></a> WineConf 2006 wrapped up Sunday and as usual I spent my flight home writing a summary of the events. </p><p> @@ -423,9 +423,9 @@ A few people left Sunday evening, but a it was a great experience. </p> -</p></section> - +</section> +</kc>

1 0

lostwages/ news/2006091901.xml wwn/wn20060919_ ...
by WineHQ Sept. 19, 2006

Sept. 19, 2006

ChangeSet ID: 28090 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/09/19 12:12:14 Added files: news : 2006091901.xml wwn : wn20060919_320.xml Log message: WineConf 2006 summary Patch: http://cvs.winehq.org/patch.py?id=28090 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2006091901.xml Added 1.1 +0 -0 lostwages/wwn/wn20060919_320.xml

1 0

lostwages/images wineconf06_grp.jpg
by WineHQ Sept. 17, 2006

Sept. 17, 2006

ChangeSet ID: 28089 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/09/17 18:20:16 Modified files: images : wineconf06_grp.jpg Log message: The full group picture Patch: http://cvs.winehq.org/patch.py?id=28089 Old revision New revision Changes Path 1.1 1.2 +3287 -1 lostwages/images/wineconf06_grp.jpg

1 0

lostwages/images wineconf06_grp.jpg wineconf06 ...
by WineHQ Sept. 17, 2006

Sept. 17, 2006

ChangeSet ID: 28088 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/09/17 17:40:22 Added files: images : wineconf06_grp.jpg wineconf06_grp_thmb.jpg Log message: WineConf06 photos Patch: http://cvs.winehq.org/patch.py?id=28088 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/images/wineconf06_grp.jpg Added 1.1 +0 -0 lostwages/images/wineconf06_grp_thmb.jpg Index: lostwages/images/wineconf06_grp.jpg diff -u -p /dev/null lostwages/images/wineconf06_grp.jpg:1.1 --- /dev/null 17 Sep 2006 22:40:22 -0000 +++ lostwages/images/wineconf06_grp.jpg 17 Sep 2006 22:40:22 -0000 @@ -0,0 +1 @@ +<html><head><title>Google Mail - wineconf2006_group.jpg</title></head><body><img src="wineconf2006_group_files/a.jpg"></body></html> \ No newline at end of file

1 0

lostwages/news 2006091701.xml
by WineHQ Sept. 17, 2006

Sept. 17, 2006

ChangeSet ID: 28087 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/09/17 10:03:36 Added files: news : 2006091701.xml Log message: Group photo link from WineConf 2006 and thank you note. Patch: http://cvs.winehq.org/patch.py?id=28087 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2006091701.xml Index: lostwages/news/2006091701.xml diff -u -p /dev/null lostwages/news/2006091701.xml:1.1 --- /dev/null 17 Sep 2006 15: 3:36 -0000 +++ lostwages/news/2006091701.xml 17 Sep 2006 15: 3:36 -0000 @@ -0,0 +1,23 @@ +<news> + <date>September 17, 2006</date> + <title>WineConf 2006</title> + <body> +<p> +<center> +<a href="/images/wineconf06_grp.jpg"><img src="/images/wineconf06_grp_thmb.jpg" /></a> +</center> + +WineConf 2006 has just about wrapped up. Approximately 35 developers +convened in Reading, England for the event. A summary will follow, +but for now you can check out this year's +<a href="/images/wineconf06_grp.jpg">group photo</a> (1MB).</p><p> + +The Wine team would especially like to thank Lars Mathiassen and the members +of the +<a href="http://www.tightpoker.com/">Party Poker Strategy Guide</a> for their +recent donations that sponsored +the event. Putting on an event of this scale without a charge for developers +is quite remarkable and their generosity helped immensely. +</p> + </body> +</news>

1 0

lostwages/templates/en/wineconf travel.template
by Jeremy Newman Sept. 14, 2006

Sept. 14, 2006

ChangeSet ID: 28086 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/09/14 10:22:15 Modified files: templates/en/wineconf: travel.template Log message: Robert Shearman <rob(a)codeweavers.com> Update the bus information for WineConf. Patch: http://cvs.winehq.org/patch.py?id=28086 Old revision New revision Changes Path 1.18 1.19 +4 -3 lostwages/templates/en/wineconf/travel.template Index: lostwages/templates/en/wineconf/travel.template diff -u -p lostwages/templates/en/wineconf/travel.template:1.18 lostwages/templates/en/wineconf/travel.template:1.19 --- lostwages/templates/en/wineconf/travel.template:1.18 14 Sep 2006 15:22:15 -0000 +++ lostwages/templates/en/wineconf/travel.template 14 Sep 2006 15:22:15 -0000 @@ -48,10 +48,11 @@ depending on your quality and travelling <li><a href="http://www.nationalexpress.com/">National Express</a></li> <li><a href="http://www.reading-buses.co.uk/">Reading Buses</a>: <ul> - <li>You will want to take the number 12 bus to get to the + <li>You will want to take the number 18 or 19 bus to get to the university from Reading station. Click here for the - <a href="http://www.reading-buses.co.uk/tt_reading_july2005/012MF20.HTML">timetable</a>. - You can ask the bus driver to let you know where to get off.</li> + <a href="http://www.reading-buses.co.uk/tt_reading_march2006/018MF31.HTML">timetable</a>. + You should get off at the St Joseph's Convent bus stop, as this + is the nearest to Windsor Hall.</li> </ul> </ul> <li>Taxi — around £5 - £10 from Reading Station to the

1 0

James Hawkins : setupapi: Add stubs for SetupOpenLog, SetupCloseLog, and SetupLogError.
by Alexandre Julliard Sept. 14, 2006

Sept. 14, 2006

Module: wine Branch: master Commit: 15b46847b0bc4d9bcc2b03d9377ce7342f4da536 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=15b46847b0bc4d9bcc2b03d… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Sep 13 17:18:23 2006 -0700 setupapi: Add stubs for SetupOpenLog, SetupCloseLog, and SetupLogError. --- dlls/setupapi/setupapi.spec | 5 +++-- dlls/setupapi/stubs.c | 26 ++++++++++++++++++++++++++ include/setupapi.h | 7 +++++++ 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index e68ca69..d0a6d22 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -247,7 +247,7 @@ # Yes, Microsoft really misspelled this @ stub SetupCancelTemporarySourceList @ stdcall SetupCloseFileQueue(ptr) @ stdcall SetupCloseInfFile(long) -@ stub SetupCloseLog +@ stdcall SetupCloseLog() @ stdcall SetupCommitFileQueue(long long ptr ptr) SetupCommitFileQueueW @ stdcall SetupCommitFileQueueA(long long ptr ptr) @ stdcall SetupCommitFileQueueW(long long ptr ptr) @@ -442,7 +442,7 @@ # Yes, Microsoft really misspelled this @ stdcall SetupIterateCabinetA(str long ptr ptr) @ stdcall SetupIterateCabinetW(wstr long ptr ptr) @ stub SetupLogErrorA -@ stub SetupLogErrorW +@ stdcall SetupLogErrorW(wstr long) @ stub SetupLogFileA @ stub SetupLogFileW @ stdcall SetupOpenAppendInfFileA(str long ptr) @@ -450,6 +450,7 @@ # Yes, Microsoft really misspelled this @ stdcall SetupOpenFileQueue() @ stdcall SetupOpenInfFileA(str str long ptr) @ stdcall SetupOpenInfFileW(wstr wstr long ptr) +@ stdcall SetupOpenLog(long) @ stdcall SetupOpenMasterInf() @ stub SetupPromptForDiskA @ stub SetupPromptForDiskW diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 33da153..a19b237 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -196,3 +196,29 @@ BOOL WINAPI RegistryDelnode(DWORD x, DWO FIXME("%08lx %08lx: stub\n", x, y); return FALSE; } + +/*********************************************************************** + * SetupCloseLog(SETUPAPI.@) + */ +void WINAPI SetupCloseLog() +{ + FIXME("() stub\n"); +} + +/*********************************************************************** + * SetupLogErrorW(SETUPAPI.@) + */ +BOOL WINAPI SetupLogErrorW(PCWSTR MessageString, LogSeverity Severity) +{ + FIXME("(%s, %ld) stub\n", debugstr_w(MessageString), Severity); + return TRUE; +} + +/*********************************************************************** + * SetupOpenLog(SETUPAPI.@) + */ +BOOL WINAPI SetupOpenLog(BOOL Reserved) +{ + FIXME("(%d) stub\n", Reserved); + return TRUE; +} diff --git a/include/setupapi.h b/include/setupapi.h index 625f15d..ada57db 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -690,6 +690,13 @@ #define INFINFO_DEFAULT_SEARCH #define INFINFO_REVERSE_DEFAULT_SEARCH 4 #define INFINFO_INF_PATH_LIST_SEARCH 5 +#define LogSeverity DWORD +#define LogSevInformation 0x00000000 +#define LogSevWarning 0x00000001 +#define LogSevError 0x00000002 +#define LogSevFatalError 0x00000003 +#define LogSevMaximum 0x00000004 + LONG WINAPI AddTagToGroupOrderList(PCWSTR lpGroupName, DWORD dwUnknown2, DWORD dwUnknown3); DWORD WINAPI CaptureAndConvertAnsiArg(PCSTR lpSrc, PWSTR *lpDst); DWORD WINAPI CaptureStringArg(PCWSTR lpSrc, PWSTR *lpDst);

1 0

James Hawkins : setupapi: Implement pSetupGetField, with tests.
by Alexandre Julliard Sept. 14, 2006

Sept. 14, 2006

Module: wine Branch: master Commit: 7588b669d8331ff64fc3b75cebe40ef518cd0de1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7588b669d8331ff64fc3b75… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Sep 13 14:19:12 2006 -0700 setupapi: Implement pSetupGetField, with tests. --- dlls/setupapi/parser.c | 16 +++++++++ dlls/setupapi/setupapi.spec | 2 + dlls/setupapi/tests/parser.c | 71 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 88 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index 6b2c5d9..72ce612 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -1875,3 +1875,19 @@ BOOL WINAPI SetupGetMultiSzFieldW( PINFC *buffer = 0; /* add final null */ return TRUE; } + +/*********************************************************************** + * pSetupGetField (SETUPAPI.@) + */ +LPCWSTR WINAPI pSetupGetField( PINFCONTEXT context, DWORD index ) +{ + struct inf_file *file = context->CurrentInf; + struct field *field = get_field( file, context->Section, context->Line, index ); + + if (!field) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return NULL; + } + return field->text; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index fd7ca3f..e68ca69 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -539,7 +539,7 @@ # Yes, Microsoft really misspelled this @ stub pSetupAppendStringToMultiSz @ stub pSetupDestroyRunOnceNodeList @ stub pSetupDirectoryIdToPath -@ stub pSetupGetField +@ stdcall pSetupGetField(ptr long) @ stdcall pSetupGetGlobalFlags() @ stub pSetupGetOsLoaderDriveAndPath @ stub pSetupGetQueueFlags diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index da49904..a4ed913 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -30,6 +30,19 @@ #include "setupapi.h" #include "wine/test.h" +/* function pointers */ +static HMODULE hSetupAPI; +static LPCWSTR (WINAPI *pSetupGetField)(PINFCONTEXT,DWORD); + +static void init_function_pointers(void) +{ + hSetupAPI = LoadLibraryA("setupapi.dll"); + if (!hSetupAPI) + return; + + pSetupGetField = (void *)GetProcAddress(hSetupAPI, "pSetupGetField"); +} + static const char tmpfile[] = ".\\tmp.inf"; /* some large strings */ @@ -394,11 +407,69 @@ static void test_close_inf_file(void) ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); } +static const char *contents = "[Version]\n" + "Signature=\"$Windows NT$\"\n" + "FileVersion=5.1.1.2\n" + "[FileBranchInfo]\n" + "RTMQFE=\"%RTMGFE_NAME%\",SP1RTM,"A4097"\n" + "[Strings]\n" + "RTMQFE_NAME = \"RTMQFE\"\n"; + +static const WCHAR getfield_res[][20] = +{ + {'R','T','M','Q','F','E',0}, + {'%','R','T','M','G','F','E','_','N','A','M','E','%',0}, + {'S','P','1','R','T','M',0}, +}; + +static void test_pSetupGetField(void) +{ + UINT err; + BOOL ret; + HINF hinf; + LPCWSTR field; + INFCONTEXT context; + int i; + + hinf = test_file_contents( contents, &err ); + ok( hinf != NULL, "Expected valid INF file\n" ); + + ret = SetupFindFirstLine( hinf, "FileBranchInfo", NULL, &context ); + ok( ret, "Failed to find first line\n" ); + + /* native Windows crashes if a NULL context is sent in */ + + for ( i = 0; i < 3; i++ ) + { + field = pSetupGetField( &context, i ); + ok( field != NULL, "Failed to get field %i\n", i ); + ok( !lstrcmpW( getfield_res[i], field ), "Wrong string returned\n" ); + + ret = HeapFree( GetProcessHeap(), 0, (LPVOID)field ); + ok( !ret, "Expected HeapFree to fail\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError() ); + } + + field = pSetupGetField( &context, 3 ); + ok( field != NULL, "Failed to get field 3\n" ); + ok( lstrlenW( field ) == 511, "Expected 511, got %d\n", lstrlenW( field ) ); + + field = pSetupGetField( &context, 4 ); + ok( field == NULL, "Expected NULL, got %p\n", field ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError() ); + + SetupCloseInfFile( hinf ); +} + START_TEST(parser) { + init_function_pointers(); test_invalid_files(); test_section_names(); test_key_names(); test_close_inf_file(); + test_pSetupGetField(); DeleteFileA( tmpfile ); }

1 0

Hwang YunSong(황윤성 : README.ko: Updated.
by Alexandre Julliard Sept. 14, 2006

Sept. 14, 2006

Module: wine Branch: master Commit: 21fe104da2689621856b05b7c17163ef47d47da0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=21fe104da2689621856b05b… Author: Hwang YunSong(황윤성 <hys545(a)dreamwiz.com> Date: Thu Sep 14 17:11:55 2006 +0900 README.ko: Updated. --- documentation/README.ko | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/documentation/README.ko b/documentation/README.ko index 48cec6d..970016c 100644 --- a/documentation/README.ko +++ b/documentation/README.ko @@ -19,7 +19,7 @@ Installer�� ϴ°�� õ�մϴ�. Wi Ǯ�׸� �� "wine [�ɼ�] Ǯ�׸�". �� ذ�� ؼ� �� Wine �� ׸�� , �� κ�� -http://www.winehq.org�� ã�� ֽ��ϴ�. +http://www.winehq.org�� ã�� ֽ��ϴ�. 3. �䱸�� @@ -30,6 +30,7 @@ Wine�� ϰ� ��Ű�� ؼ�, �� FreeBSD 5.3 �̳� �� ֽ� Solaris x86 2.5 �̳� �� ֽ� NetBSD-�� + MacOS X 10.4 �� ֽ� �� Wine�� Ű�� ؼ� Ŀ�� 尡 �ʿ��մϴ�, �׷�� Ѵٰ� ��޵� �ü�� մϴ�. @@ -37,8 +38,8 @@ Wine�� Ű�� ؼ� Ŀ�� Linux �� Linux 2.2.x�� ۵��ϰ� Linux 2.0.x �� Ƹ�� ۵�� Դϴ�. - (2.0.x �� õ� �浿�� ŵ�ϴ�), - 2.4.x�� Ŀ�� ϴ°�� ϴ�. + (2.0.x �� õ� �浹�� ŵ�ϴ�), + 2.4.x�� 2.6.x�� Ŀ�� ϴ°�� ϴ�. FreeBSD ��: Wine FreeBSD 4.x �ϰ� FreeBSD 5.x�� ֽ��ϴ�, �׷�� @@ -46,18 +47,22 @@ FreeBSD ��: FreeBSD ��Ʈ Ʈ�� <ftp://ftp.freebsd.org/pub/FreeBSD/ports/ports/emulators/wine/> - �� ֽ��ϴ�. + �� ֽ��ϴ�. Solaris ��: �� Wine�� ϱ� ��ؼ�� GNU ��ü��(toolchain)�� ʿ�� Դϴ�. (gcc, gas, etc.). �� : gcc�� ̶�� gas ��ġ�� *�ʽ��ϴ�*. gcc�� Ѵ�� gas�� ġ�ϰų�, gnu ��(tool)�κ�� - cc, as �׸�� ld �� ʺ�� ũ��Ű�� ʼ��Դϴ�. + cc, as �׸�� ld �� ɺ�� ũ��Ű�� ʼ��Դϴ�. NetBSD ��: �� USER_LDT, SYSVSHM, SYSVSEM, �׸�� SYSVMSG �ɼ�� Ŀ�ο�� 밡��ϰ� �Ǿ��ִ�� Ȯ��Ͻʽÿ� +MacOS ��: + �� x86�� ϱ� �� Xcode 2.4�� ֽŹ�� ʿ�� մϴ� . + + ��ϴ� �� ý��: @@ -65,27 +70,25 @@ NetBSD ��: ��丮�� umsdod�� Ѵٸ� ��۽� �� Դϴ�. ��ٸ� �� �� ռ� �� Ǿ��ϴ�. ��, NTFS�� б� ��θ� ��ϴ� �� մϴ�,�츮�� Ǯ�׸�� 𼭳� �� - �ִ°�� ʿ��ϴٸ� NTFS�� ϴ� �� ſ� �� ִ� ��ġ�� ϴ� + �ִ°�� ʿ��ϴٸ� NTFS�� ϴ� �� ſ� �� ִ� �� ϴ� �� õ�մϴ�. �⺻ �䱸��: �� X11 �� ġ�� ʿ�� մϴ� - (��ȿ�� xlib6g-dev�̶�� Ҹ�� ޿�� XFree86-devel��). + (��ȿ�� xlib6g-dev�̶�� Ҹ�� ޿�� XFree86-devel�Դϴ�). �� 䱸��: x86 �ý�� gcc >= 2.7.2 �ʿ�. 2.7.2.3�� ȭ�� Ҷ� � ��Ͽ�� - �߻��մϴ�, �� ó�� ߻��մϴ�. pgcc�� - Wine�� Ҽ� ��ϴ�. �� ϴ�. + �߻��մϴ�, �� ó�� ߻��մϴ�.��. �� "make"�� ʿ�� Ұ��Դϴ�. (GNU make�� ). - �� flex �� 2.5 �̻�� bison�� ʿ�� մϴ�. �� - ��̳� �� Ѵٸ� flex�� bison ��Ű�� ġ�Ͻʽÿ�. + �� flex �� 2.5 �̻�� bison�� ʿ�� մϴ�. �� ̺귯��: - �� CUPS �μ⸦ ��ϱ⸦ ��Ѵٸ�, cups�� cups-devel ��Ű�� - ��ġ�Ͻʽÿ�. + ./configure --verbose �� Ű�� ý��۾ּ� �߰�� + �� ִ� �� ̺귯�� ս��ϴ�. 4. �� @@ -109,7 +112,7 @@ (README�� ϰ� �ִ�)�ֻ�� gunzip -c patch-file | patch -p1 -"patch-file" �� ġ �� ̸��Դϴ�. (Wine-yymmdd.diff.gz�� ). +"patch-file" �� ġ �� ̸��Դϴ�. (wine-0.9.x.diff.bz2�� ). �� "./configure"�� ϰ� , "make depend && make�� Ͻʽÿ�". 5. �¾�

1 0

Andrew Talbot : gdi: Cast-qual warnings fix.
by Alexandre Julliard Sept. 14, 2006

Sept. 14, 2006

Module: wine Branch: master Commit: 7ee2f77158fc93281fbf01206e6de1ebaab0e9a6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7ee2f77158fc93281fbf012… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Sep 14 01:00:38 2006 +0100 gdi: Cast-qual warnings fix. --- dlls/gdi/font.c | 6 +++--- dlls/gdi/printdrv.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdi/font.c b/dlls/gdi/font.c index ec9074d..a4327de 100644 --- a/dlls/gdi/font.c +++ b/dlls/gdi/font.c @@ -245,7 +245,7 @@ static void FONT_LogFontWToA( const LOGF static void FONT_EnumLogFontExWTo16( const ENUMLOGFONTEXW *fontW, LPENUMLOGFONTEX16 font16 ) { - FONT_LogFontWTo16( (LPLOGFONTW)fontW, (LPLOGFONT16)font16); + FONT_LogFontWTo16( (const LOGFONTW *)fontW, (LPLOGFONT16)font16); WideCharToMultiByte( CP_ACP, 0, fontW->elfFullName, -1, (LPSTR) font16->elfFullName, LF_FULLFACESIZE, NULL, NULL ); @@ -260,7 +260,7 @@ static void FONT_EnumLogFontExWTo16( con static void FONT_EnumLogFontExWToA( const ENUMLOGFONTEXW *fontW, LPENUMLOGFONTEXA fontA ) { - FONT_LogFontWToA( (LPLOGFONTW)fontW, (LPLOGFONTA)fontA); + FONT_LogFontWToA( (const LOGFONTW *)fontW, (LPLOGFONTA)fontA); WideCharToMultiByte( CP_ACP, 0, fontW->elfFullName, -1, (LPSTR) fontA->elfFullName, LF_FULLFACESIZE, NULL, NULL ); @@ -332,7 +332,7 @@ static void FONT_NewTextMetricExWTo16(co static void FONT_NewTextMetricExWToA(const NEWTEXTMETRICEXW *ptmW, NEWTEXTMETRICEXA *ptmA ) { - FONT_TextMetricWToA((LPTEXTMETRICW)ptmW, (LPTEXTMETRICA)ptmA); + FONT_TextMetricWToA((const TEXTMETRICW *)ptmW, (LPTEXTMETRICA)ptmA); ptmA->ntmTm.ntmFlags = ptmW->ntmTm.ntmFlags; ptmA->ntmTm.ntmSizeEM = ptmW->ntmTm.ntmSizeEM; ptmA->ntmTm.ntmCellHeight = ptmW->ntmTm.ntmCellHeight; diff --git a/dlls/gdi/printdrv.c b/dlls/gdi/printdrv.c index 57e7d39..5be3370 100644 --- a/dlls/gdi/printdrv.c +++ b/dlls/gdi/printdrv.c @@ -452,7 +452,7 @@ static int CreateSpoolFile(LPCSTR pszOut { int fd=-1; char psCmd[1024]; - char *psCmdP = psCmd; + const char *psCmdP = psCmd; HKEY hkey; /* TTD convert the 'output device' into a spool file name */ @@ -474,7 +474,7 @@ static int CreateSpoolFile(LPCSTR pszOut TRACE("Got printerSpoolCommand '%s' for output device '%s'\n", psCmd, pszOutput); if (!*psCmd) - psCmdP = (char *)pszOutput; + psCmdP = pszOutput; else { while (*psCmdP && isspace(*psCmdP))

1 0