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

Jacek Caban : mlang.idl: Added IMultiLanguage3 declaration.
by Alexandre Julliard 23 Aug '06

23 Aug '06

Module: wine Branch: master Commit: 5b39aa25c9114be6c9db1d228528c7e6ff988099 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5b39aa25c9114be6c9db1d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 23 18:14:09 2006 +0200 mlang.idl: Added IMultiLanguage3 declaration. --- include/mlang.idl | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/include/mlang.idl b/include/mlang.idl index 0aaea87..96e96fa 100644 --- a/include/mlang.idl +++ b/include/mlang.idl @@ -557,6 +557,34 @@ interface IMultiLanguage2 : IUnknown } [ + object, + uuid(4e5868ab-b157-4623-9acc-6a1d9caebe04), + pointer_default(unique) +] +interface IMultiLanguage3 : IMultiLanguage2 +{ + typedef [unique] IMultiLanguage3 *LPMULTILANGUAGE3; + HRESULT DetectOutboundCodePage( + [in] DWORD dwFlags, + [in] LPCWSTR lpWideCharStr, + [in] UINT cchWideChar, + [in] UINT *puiPreferredCodePages, + [in] UINT nPreferredCodePages, + [in] UINT *puiDetectedCodePages, + [in, out] UINT *pnDetectedCodePages, + [in] WCHAR *lpSpecialChar); + + HRESULT DetectOutboundCodePageInIStream( + [in] DWORD dwFlags, + [in] IStream *pStrIn, + [in] UINT *puiPreferredCodePages, + [in] UINT nPreferredCodePages, + [in] UINT *puiDetectedCodePages, + [in, out] UINT *pnDetectedCodePages, + [in] WCHAR *lpSpecialChar); +} + +[ uuid(275C23E2-3747-11d0-9FEA-00AA003f8646) ] coclass CMultiLanguage

1 0

Andrzej Popowski : msvcrt: Fix scanf format "%i" base detection.
by Alexandre Julliard 23 Aug '06

23 Aug '06

Module: wine Branch: master Commit: 4e5c51a6eefb0ee1afff02b8a850e4a5d2a27b2d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4e5c51a6eefb0ee1afff02b… Author: Andrzej Popowski <popej(a)friko.onet.pl> Date: Tue Aug 22 19:38:56 2006 +0200 msvcrt: Fix scanf format "%i" base detection. --- dlls/msvcrt/scanf.h | 5 ++++- dlls/msvcrt/tests/scanf.c | 12 ++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 8299b57..139f142 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -169,7 +169,7 @@ #endif /* WIDE_SCANF */ base = 10; goto number; case 'i': /* generic integer */ - base = 10; + base = 0; number: { /* read an integer */ ULONGLONG cur = 0; @@ -200,6 +200,9 @@ #endif /* WIDE_SCANF */ } else if (base==0) base = 8; } + /* format %i without indication of base */ + if (base==0) + base = 10; /* throw away leading zeros */ while (width!=0 && nch=='0') { nch = _GETC_(file); diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 244327b..71e6e22 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -110,6 +110,18 @@ static void test_sscanf( void ) ok(ret == 1, "Wrong number of arguments read: %d (expected 1)\n", ret); ok(result == -1, "Read %d, expected -1\n", result); + /* Check %i for octal and hexadecimal input */ + result = 0; + strcpy(buffer,"017"); + ret = sscanf(buffer, "%i", &result); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ok(result == 15, "Wrong number read\n"); + result = 0; + strcpy(buffer,"0x17"); + ret = sscanf(buffer, "%i", &result); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ok(result == 23, "Wrong number read\n"); + /* %o */ result = 0; ret = sscanf("-1", "%o", &result);

1 0

Stefan Huehner : winedbg: Fix typo in manpage.
by Alexandre Julliard 23 Aug '06

23 Aug '06

Module: wine Branch: master Commit: 803f3bd0a9af7fc10495021ad602c4f9a048edd2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=803f3bd0a9af7fc10495021… Author: Stefan Huehner <stefan(a)huehner.org> Date: Mon Aug 21 13:18:34 2006 +0200 winedbg: Fix typo in manpage. --- programs/winedbg/winedbg.man.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/winedbg.man.in b/programs/winedbg/winedbg.man.in index c9922c7..953b547 100644 --- a/programs/winedbg/winedbg.man.in +++ b/programs/winedbg/winedbg.man.in @@ -150,7 +150,7 @@ Execute next assembly instruction (enter .IP \fBnexti\fR Execute next assembly instruction (doesn't enter function call) .IP \fBfinish\fR -Excute until return of current function is reached. +Execute until return of current function is reached. .PP \fBcont\fR, \fBstep\fR, \fBnext\fR, \fBstepi\fR, \fBnexti\fR can be postfixed by a number (N), meaning that the command must be executed N

1 0

Stefan Dösinger : wined3d: Make the destination surface glDirty in UpdateSurface.
by Alexandre Julliard 23 Aug '06

23 Aug '06

Module: wine Branch: master Commit: e0b21688fac6ae1d6f51dfabdb5d6f61c51cba66 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e0b21688fac6ae1d6f51dfa… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Aug 19 23:57:43 2006 +0200 wined3d: Make the destination surface glDirty in UpdateSurface. --- dlls/wined3d/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 27791b6..3c2f9ea 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6828,6 +6828,7 @@ static HRESULT WINAPI IWineD3DDeviceIm } } checkGLcall("glTexSubImage2D"); + ((IWineD3DSurfaceImpl *)pDestinationSurface)->Flags |= SFLAG_GLDIRTY; /* I only need to look up baseTexture here, so it may be a good idea to hava a GL_TARGET -> * GL_DIMENSIONS lookup, or maybe store the dimensions on the surface (but that's making the

1 0

Andrew Talbot : winspool.drv/tests: Write-strings warnings fix.
by Alexandre Julliard 23 Aug '06

23 Aug '06

Module: wine Branch: master Commit: 3f2e2601760a733c889ad562ba8e7d752873640f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3f2e2601760a733c889ad56… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Aug 19 16:15:59 2006 +0100 winspool.drv/tests: Write-strings warnings fix. --- dlls/winspool.drv/tests/info.c | 71 ++++++++++++++++++++++------------------ 1 files changed, 39 insertions(+), 32 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 85a3353..495b06e 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -312,7 +312,7 @@ #endif DeleteMonitorA(NULL, entry->env, winetest_monitor); SetLastError(MAGIC_DEAD); - res = AddMonitorA("", 2, (LPBYTE) &mi2a); + res = AddMonitorA(empty, 2, (LPBYTE) &mi2a); ok(res, "returned %ld with %ld (expected '!= 0')\n", res, GetLastError()); /* cleanup */ @@ -324,9 +324,11 @@ #endif static void test_DeleteMonitor(void) { - MONITOR_INFO_2A mi2a; - struct monitor_entry * entry = NULL; - DWORD res; + MONITOR_INFO_2A mi2a; + struct monitor_entry * entry = NULL; + DWORD res; + static CHAR empty[] = "", + bad_env[] = "bad_env"; entry = find_installed_monitor(); @@ -364,12 +366,12 @@ static void test_DeleteMonitor(void) AddMonitorA(NULL, 2, (LPBYTE) &mi2a); SetLastError(MAGIC_DEAD); - res = DeleteMonitorA(NULL, "", winetest_monitor); + res = DeleteMonitorA(NULL, empty, winetest_monitor); ok(res, "returned %ld with %ld (expected '!=0')\n", res, GetLastError()); AddMonitorA(NULL, 2, (LPBYTE) &mi2a); SetLastError(MAGIC_DEAD); - res = DeleteMonitorA(NULL, "bad_env", winetest_monitor); + res = DeleteMonitorA(NULL, bad_env, winetest_monitor); ok(res, "returned %ld with %ld (expected '!=0')\n", res, GetLastError()); /* the monitor-name */ @@ -385,7 +387,7 @@ static void test_DeleteMonitor(void) AddMonitorA(NULL, 2, (LPBYTE) &mi2a); SetLastError(MAGIC_DEAD); - res = DeleteMonitorA(NULL, entry->env, ""); + res = DeleteMonitorA(NULL, entry->env, empty); /* NT: ERROR_INVALID_PARAMETER (87), 9x: ERROR_INVALID_NAME (123)*/ ok( !res && ((GetLastError() == ERROR_INVALID_PARAMETER) || @@ -395,7 +397,7 @@ static void test_DeleteMonitor(void) AddMonitorA(NULL, 2, (LPBYTE) &mi2a); SetLastError(MAGIC_DEAD); - res = DeleteMonitorA("", entry->env, winetest_monitor); + res = DeleteMonitorA(empty, entry->env, winetest_monitor); ok(res, "returned %ld with %ld (expected '!=0')\n", res, GetLastError()); /* cleanup */ @@ -697,9 +699,10 @@ static void test_GetDefaultPrinter(void) static void test_GetPrinterDriverDirectory(void) { - LPBYTE buffer = NULL; - DWORD cbBuf = 0, pcbNeeded = 0; - BOOL res; + LPBYTE buffer = NULL; + DWORD cbBuf = 0, pcbNeeded = 0; + BOOL res; + static CHAR empty[] = ""; SetLastError(MAGIC_DEAD); res = GetPrinterDriverDirectoryA( NULL, NULL, 1, NULL, 0, &cbBuf); @@ -827,15 +830,15 @@ static void test_GetPrinterDriverDirecto /* A Setup-Programm (PDFCreator_0.8.0) use empty strings */ SetLastError(MAGIC_DEAD); - res = GetPrinterDriverDirectoryA("", "", 1, buffer, cbBuf*2, &pcbNeeded); + res = GetPrinterDriverDirectoryA(empty, empty, 1, buffer, cbBuf*2, &pcbNeeded); ok(res, "returned %d with %ld (expected '!=0')\n", res, GetLastError() ); SetLastError(MAGIC_DEAD); - res = GetPrinterDriverDirectoryA(NULL, "", 1, buffer, cbBuf*2, &pcbNeeded); + res = GetPrinterDriverDirectoryA(NULL, empty, 1, buffer, cbBuf*2, &pcbNeeded); ok(res, "returned %d with %ld (expected '!=0')\n", res, GetLastError() ); SetLastError(MAGIC_DEAD); - res = GetPrinterDriverDirectoryA("", NULL, 1, buffer, cbBuf*2, &pcbNeeded); + res = GetPrinterDriverDirectoryA(empty, NULL, 1, buffer, cbBuf*2, &pcbNeeded); ok(res, "returned %d with %ld (expected '!=0')\n", res, GetLastError() ); HeapFree( GetProcessHeap(), 0, buffer); @@ -845,10 +848,13 @@ static void test_GetPrinterDriverDirecto static void test_GetPrintProcessorDirectory(void) { - LPBYTE buffer = NULL; - DWORD cbBuf = 0; - DWORD pcbNeeded = 0; - BOOL res; + LPBYTE buffer = NULL; + DWORD cbBuf = 0; + DWORD pcbNeeded = 0; + BOOL res; + static CHAR empty[] = "", + invalid_env[] = "invalid_env", + invalid_server[] = "\\invalid_server"; SetLastError(0xdeadbeef); res = GetPrintProcessorDirectoryA(NULL, NULL, 1, NULL, 0, &cbBuf); @@ -924,7 +930,7 @@ #endif /* Empty environment is the same as the default environment */ buffer[0] = '\0'; SetLastError(0xdeadbeef); - res = GetPrintProcessorDirectoryA(NULL, "", 1, buffer, cbBuf*2, &pcbNeeded); + res = GetPrintProcessorDirectoryA(NULL, empty, 1, buffer, cbBuf*2, &pcbNeeded); ok(res, "returned %d with %ld (expected '!= 0')\n", res, GetLastError()); /* "Windows 4.0" is valid for win9x and NT */ @@ -945,7 +951,7 @@ #endif /* invalid on all Systems */ buffer[0] = '\0'; SetLastError(0xdeadbeef); - res = GetPrintProcessorDirectoryA(NULL, "invalid_env", 1, buffer, cbBuf*2, &pcbNeeded); + res = GetPrintProcessorDirectoryA(NULL, invalid_env, 1, buffer, cbBuf*2, &pcbNeeded); ok( !res && (GetLastError() == ERROR_INVALID_ENVIRONMENT), "returned %d with %ld (expected '0' with ERROR_INVALID_ENVIRONMENT)\n", res, GetLastError()); @@ -953,13 +959,13 @@ #endif /* Empty servername is the same as the local computer */ buffer[0] = '\0'; SetLastError(0xdeadbeef); - res = GetPrintProcessorDirectoryA("", NULL, 1, buffer, cbBuf*2, &pcbNeeded); + res = GetPrintProcessorDirectoryA(empty, NULL, 1, buffer, cbBuf*2, &pcbNeeded); ok(res, "returned %d with %ld (expected '!= 0')\n", res, GetLastError()); /* invalid on all Systems */ buffer[0] = '\0'; SetLastError(0xdeadbeef); - res = GetPrintProcessorDirectoryA("\\invalid_server", NULL, 1, buffer, cbBuf*2, &pcbNeeded); + res = GetPrintProcessorDirectoryA(invalid_server, NULL, 1, buffer, cbBuf*2, &pcbNeeded); ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), "returned %d with %ld (expected '0' with ERROR_INVALID_PARAMETER)\n", res, GetLastError()); @@ -971,14 +977,15 @@ #endif static void test_OpenPrinter(void) { - PRINTER_DEFAULTSA defaults; - HANDLE hprinter; - LPSTR default_printer; - DWORD res; - DWORD size; - CHAR buffer[DEFAULT_PRINTER_SIZE]; - static CHAR empty[] = ""; - LPSTR ptr; + PRINTER_DEFAULTSA defaults; + HANDLE hprinter; + LPSTR default_printer; + DWORD res; + DWORD size; + CHAR buffer[DEFAULT_PRINTER_SIZE]; + LPSTR ptr; + static CHAR empty[] = "", + illegal_name[] = "illegal,name"; SetLastError(MAGIC_DEAD); res = OpenPrinter(NULL, NULL, NULL); @@ -1046,7 +1053,7 @@ static void test_OpenPrinter(void) /* Invalid Printername */ hprinter = (HANDLE) MAGIC_DEAD; SetLastError(MAGIC_DEAD); - res = OpenPrinter("illegal,name", &hprinter, NULL); + res = OpenPrinter(illegal_name, &hprinter, NULL); ok(!res && ((GetLastError() == ERROR_INVALID_PRINTER_NAME) || (GetLastError() == ERROR_INVALID_PARAMETER) ), "returned %ld with %ld (expected '0' with: ERROR_INVALID_PARAMETER or" \ @@ -1055,7 +1062,7 @@ static void test_OpenPrinter(void) hprinter = (HANDLE) MAGIC_DEAD; SetLastError(MAGIC_DEAD); - res = OpenPrinter("", &hprinter, NULL); + res = OpenPrinter(empty, &hprinter, NULL); /* NT: ERROR_INVALID_PRINTER_NAME, 9x: ERROR_INVALID_PARAMETER */ ok( !res && ((GetLastError() == ERROR_INVALID_PRINTER_NAME) ||

1 0

Andrew Talbot : winspool.drv: Write-strings warnings fix.
by Alexandre Julliard 23 Aug '06

23 Aug '06

Module: wine Branch: master Commit: 02c04ea2523b7d4d91ad675b9f6896f25a84d704 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=02c04ea2523b7d4d91ad675… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Aug 19 14:22:39 2006 +0100 winspool.drv: Write-strings warnings fix. --- dlls/winspool.drv/info.c | 96 ++++++++++++++++++++++++++++++---------------- 1 files changed, 62 insertions(+), 34 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index a7c5d68..d00192c 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -376,17 +376,26 @@ #undef DYNCUPS RegDeleteValueW(hkeyPrinter, May_Delete_Value); RegCloseKey(hkeyPrinter); } else { + static CHAR data_type[] = "RAW", + print_proc[] = "WinPrint", + driver_name[] = "PS Driver", + comment[] = "WINEPS Printer using CUPS", + location[] = "<physical location of printer>", + params[] = "<parameters?>", + share_name[] = "<share name?>", + sep_file[] = "<sep file?>"; + memset(&pinfo2a,0,sizeof(pinfo2a)); - pinfo2a.pPrinterName = dests[i].name; - pinfo2a.pDatatype = "RAW"; - pinfo2a.pPrintProcessor = "WinPrint"; - pinfo2a.pDriverName = "PS Driver"; - pinfo2a.pComment = "WINEPS Printer using CUPS"; - pinfo2a.pLocation = "<physical location of printer>"; - pinfo2a.pPortName = port; - pinfo2a.pParameters = "<parameters?>"; - pinfo2a.pShareName = "<share name?>"; - pinfo2a.pSepFile = "<sep file?>"; + pinfo2a.pPrinterName = dests[i].name; + pinfo2a.pDatatype = data_type; + pinfo2a.pPrintProcessor = print_proc; + pinfo2a.pDriverName = driver_name; + pinfo2a.pComment = comment; + pinfo2a.pLocation = location; + pinfo2a.pPortName = port; + pinfo2a.pParameters = params; + pinfo2a.pShareName = share_name; + pinfo2a.pSepFile = sep_file; if (!AddPrinterA(NULL,2,(LPBYTE)&pinfo2a)) { if (GetLastError() != ERROR_PRINTER_ALREADY_EXISTS) @@ -405,7 +414,7 @@ #undef DYNCUPS #endif static BOOL -PRINTCAP_ParseEntry(char *pent,BOOL isfirst) { +PRINTCAP_ParseEntry(const char *pent, BOOL isfirst) { PRINTER_INFO_2A pinfo2a; char *e,*s,*name,*prettyname,*devname; BOOL ret = FALSE, set_default = FALSE; @@ -490,17 +499,25 @@ PRINTCAP_ParseEntry(char *pent,BOOL isfi RegDeleteValueW(hkeyPrinter, May_Delete_Value); RegCloseKey(hkeyPrinter); } else { + static CHAR data_type[] = "RAW", + print_proc[] = "WinPrint", + driver_name[] = "PS Driver", + comment[] = "WINEPS Printer using LPR", + params[] = "<parameters?>", + share_name[] = "<share name?>", + sep_file[] = "<sep file?>"; + memset(&pinfo2a,0,sizeof(pinfo2a)); - pinfo2a.pPrinterName = devname; - pinfo2a.pDatatype = "RAW"; - pinfo2a.pPrintProcessor = "WinPrint"; - pinfo2a.pDriverName = "PS Driver"; - pinfo2a.pComment = "WINEPS Printer using LPR"; - pinfo2a.pLocation = prettyname; - pinfo2a.pPortName = port; - pinfo2a.pParameters = "<parameters?>"; - pinfo2a.pShareName = "<share name?>"; - pinfo2a.pSepFile = "<sep file?>"; + pinfo2a.pPrinterName = devname; + pinfo2a.pDatatype = data_type; + pinfo2a.pPrintProcessor = print_proc; + pinfo2a.pDriverName = driver_name; + pinfo2a.pComment = comment; + pinfo2a.pLocation = prettyname; + pinfo2a.pPortName = port; + pinfo2a.pParameters = params; + pinfo2a.pShareName = share_name; + pinfo2a.pSepFile = sep_file; if (!AddPrinterA(NULL,2,(LPBYTE)&pinfo2a)) { if (GetLastError()!=ERROR_PRINTER_ALREADY_EXISTS) @@ -587,17 +604,25 @@ void WINSPOOL_LoadSystemPrinters(void) DWORD needed, num, i; WCHAR PrinterName[256]; BOOL done = FALSE; + static CHAR name[] = "PS Driver", + driver_path[] = "wineps16", + data_file[] = "<datafile?>", + config_file[] = "wineps16", + help_file[] = "<helpfile?>", + dep_file[] = "<dependend files?>", + monitor_name[] = "<monitor name?>", + default_data_type[] = "RAW"; di3a.cVersion = (GetVersion() & 0x80000000) ? 0 : 3; /* FIXME: add 1, 2 */ - di3a.pName = "PS Driver"; - di3a.pEnvironment = NULL; /* NULL means auto */ - di3a.pDriverPath = "wineps16"; - di3a.pDataFile = "<datafile?>"; - di3a.pConfigFile = "wineps16"; - di3a.pHelpFile = "<helpfile?>"; - di3a.pDependentFiles = "<dependend files?>"; - di3a.pMonitorName = "<monitor name?>"; - di3a.pDefaultDataType = "RAW"; + di3a.pName = name; + di3a.pEnvironment = NULL; /* NULL means auto */ + di3a.pDriverPath = driver_path; + di3a.pDataFile = data_file; + di3a.pConfigFile = config_file; + di3a.pHelpFile = help_file; + di3a.pDependentFiles = dep_file; + di3a.pMonitorName = monitor_name; + di3a.pDefaultDataType = default_data_type; if (!AddPrinterDriverA(NULL,3,(LPBYTE)&di3a)) { ERR("Failed adding PS Driver (%ld)\n",GetLastError()); @@ -3936,6 +3961,8 @@ BOOL WINAPI AddPrinterDriverA(LPSTR pNam { DRIVER_INFO_3A di3; HKEY hkeyDrivers, hkeyName; + static CHAR empty[] = "", + nullnull[] = "\0"; TRACE("(%s,%ld,%p)\n",debugstr_a(pName),level,pDriverInfo); @@ -3966,10 +3993,11 @@ BOOL WINAPI AddPrinterDriverA(LPSTR pNam SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - if(!di3.pDefaultDataType) di3.pDefaultDataType = ""; - if(!di3.pDependentFiles) di3.pDependentFiles = "\0"; - if(!di3.pHelpFile) di3.pHelpFile = ""; - if(!di3.pMonitorName) di3.pMonitorName = ""; + + if(!di3.pDefaultDataType) di3.pDefaultDataType = empty; + if(!di3.pDependentFiles) di3.pDependentFiles = nullnull; + if(!di3.pHelpFile) di3.pHelpFile = empty; + if(!di3.pMonitorName) di3.pMonitorName = empty; hkeyDrivers = WINSPOOL_OpenDriverReg(di3.pEnvironment, FALSE);

1 0

Andrew Talbot : ddraw: Write-strings warnings fix.
by Alexandre Julliard 23 Aug '06

23 Aug '06

Module: wine Branch: master Commit: 04a0f74b6335af482c33b63dae66b92a19a2b04b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=04a0f74b6335af482c33b63… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Aug 18 19:06:07 2006 +0100 ddraw: Write-strings warnings fix. --- dlls/ddraw/main.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 5c32ab6..8aab95c 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -390,7 +390,10 @@ DirectDrawEnumerateA(LPDDENUMCALLBACKA C /* We only have one driver */ __TRY { - stop = !Callback(NULL, "DirectDraw HAL", "display", Context); + static CHAR driver_desc[] = "DirectDraw HAL", + driver_name[] = "display"; + + stop = !Callback(NULL, driver_desc, driver_name, Context); } __EXCEPT_PAGE_FAULT { @@ -422,8 +425,11 @@ DirectDrawEnumerateExA(LPDDENUMCALLBACKE /* We only have one driver by now */ __TRY { + static CHAR driver_desc[] = "DirectDraw HAL", + driver_name[] = "display"; + /* QuickTime expects the description "DirectDraw HAL" */ - stop = !Callback(NULL, "DirectDraw HAL", "display", Context, 0); + stop = !Callback(NULL, driver_desc, driver_name, Context, 0); } __EXCEPT_PAGE_FAULT {

1 0

Andrew Talbot : wineps.drv: Write-strings warnings fix.
by Alexandre Julliard 23 Aug '06

23 Aug '06

Module: wine Branch: master Commit: 6e07f23482072bcf626d3eac2823022e414ac5e0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6e07f23482072bcf626d3ea… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Aug 18 20:17:19 2006 +0100 wineps.drv: Write-strings warnings fix. --- dlls/wineps.drv/ppd.c | 2 +- dlls/wineps.drv/psdrv.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index 8fd40a2..0b17bce 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -526,7 +526,7 @@ static char *PSDRV_PPDGetWord(char *str, * PSDRV_AddSlot * */ -static INT PSDRV_AddSlot(PPD *ppd, LPSTR szName, LPSTR szFullName, +static INT PSDRV_AddSlot(PPD *ppd, LPCSTR szName, LPCSTR szFullName, LPSTR szInvocationString, WORD wWinBin) { INPUTSLOT *slot, **insert = &ppd->InputSlots; diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index f60731d..74abe39 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -173,8 +173,8 @@ typedef struct _tagCONSTRAINT { } CONSTRAINT; typedef struct _tagINPUTSLOT { - char *Name; - char *FullName; + const char *Name; + const char *FullName; char *InvocationString; WORD WinBin; /* eg DMBIN_LOWER */ struct _tagINPUTSLOT *next;

1 0

Alexandre Julliard : tools: Added a man page for wineprefixcreate.
by Alexandre Julliard 23 Aug '06

23 Aug '06

Module: wine Branch: master Commit: 6bcbc126edcc255e9ab3c4ca41e9dfc2fb441548 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6bcbc126edcc255e9ab3c4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 23 15:59:05 2006 +0200 tools: Added a man page for wineprefixcreate. --- tools/.gitignore | 1 + tools/Makefile.in | 8 +++- tools/wineprefixcreate.man.in | 82 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 88 insertions(+), 3 deletions(-) create mode 100644 tools/wineprefixcreate.man.in diff --git a/tools/.gitignore b/tools/.gitignore index dd1392f..767f5bd 100644 --- a/tools/.gitignore +++ b/tools/.gitignore @@ -7,3 +7,4 @@ /sfnt2fnt /winemaker.man /wineprefixcreate +/wineprefixcreate.man diff --git a/tools/Makefile.in b/tools/Makefile.in index e205e4f..982a02c 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -19,7 +19,8 @@ PROGRAMS = \ wineprefixcreate MANPAGES = \ - winemaker.man + winemaker.man \ + wineprefixcreate.man C_SRCS = \ bin2res.c \ @@ -79,10 +80,11 @@ wineprefixcreate: wineprefixcreate.in re sed -e "s,@bintodlldir\@,`$(RELPATH) $(bindir) $(dlldir)`,g" -e "s,@bintodatadir\@,`$(RELPATH) $(bindir) $(datadir)/wine`,g" $(SRCDIR)/wineprefixcreate.in >$@ || ($(RM) $@ && false) chmod +x wineprefixcreate -install install-lib:: wineprefixcreate $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)/wine $(DESTDIR)$(datadir)/applications +install install-lib:: wineprefixcreate $(INSTALLDIRS) $(INSTALL_SCRIPT) wineprefixcreate $(DESTDIR)$(bindir)/wineprefixcreate $(INSTALL_DATA) $(SRCDIR)/wine.inf $(DESTDIR)$(datadir)/wine/wine.inf $(INSTALL_DATA) $(SRCDIR)/wine.desktop $(DESTDIR)$(datadir)/applications/wine.desktop + $(INSTALL_DATA) wineprefixcreate.man $(DESTDIR)$(mandir)/man$(prog_manext)/wineprefixcreate.$(prog_manext) -$(UPDATE_DESKTOP_DATABASE) install install-dev:: $(INSTALLSUBDIRS:%=%/__install__) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext) @@ -90,7 +92,7 @@ install install-dev:: $(INSTALLSUBDIRS:% $(INSTALL_DATA) winemaker.man $(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext) uninstall:: - $(RM) $(DESTDIR)$(bindir)/winemaker $(DESTDIR)$(bindir)/wineprefixcreate $(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext) $(DESTDIR)$(datadir)/wine/wine.inf $(DESTDIR)$(datadir)/applications/wine.desktop + $(RM) $(DESTDIR)$(bindir)/winemaker $(DESTDIR)$(bindir)/wineprefixcreate $(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext) $(DESTDIR)$(mandir)/man$(prog_manext)/wineprefixcreate.$(prog_manext) $(DESTDIR)$(datadir)/wine/wine.inf $(DESTDIR)$(datadir)/applications/wine.desktop -$(UPDATE_DESKTOP_DATABASE) ### Dependencies: diff --git a/tools/wineprefixcreate.man.in b/tools/wineprefixcreate.man.in new file mode 100644 index 0000000..daaedeb --- /dev/null +++ b/tools/wineprefixcreate.man.in @@ -0,0 +1,82 @@ +.\" -*- nroff -*- +.TH WINEPREFIXCREATE 1 "August 2006" "@PACKAGE_STRING@" "Windows on Unix" +.SH NAME +wineprefixcreate \- create or update the Wine configuration +.SH SYNOPSIS +.BI wineprefixcreate\ [options] +.SH DESCRIPTION +.B wineprefixcreate +creates or updates a Wine configuration directory. When running Wine, +the base name of the configuration directory is specified in the +WINEPREFIX variable, hence the name of this tool. +.PP +.B wineprefixcreate +is launched automatically by +.B wine(1) +if you don't have an existing configuration. However, it can sometimes +be useful to run it explicitly to create a different directory, or +update an existing one. +.SH OPTIONS +.TP +.BI \--prefix\ directory +Create the specified directory (or update it if it exists already). If +this option is not specified, +.B wineprefixcreate +defaults to the +.I WINEPREFIX +environment variable, or to +.I $HOME/.wine +if not set. +.TP +.B \-h, \--help +Display a usage message. +.TP +.B \-q, \--quiet +Don't display any status messages. +.TP +.B \-w, \--wait +Wait for +.B wineserver +to save everything before returning. This is necessary for instance if +you are planning to rename the directory once created; otherwise a +running server could still try to access the directory under its old +name. +.SH ENVIRONMENT VARIABLES +.TP +.I WINEPREFIX +If set, the content of this variable is taken as the name of the directory where +.B wineprefixcreate +stores its data (the default is \fI$HOME/.wine\fR). All +.B wine +processes using the same prefix share certain things like registry, +shared memory and kernel objects. By setting +.I WINEPREFIX +to different values for different Wine processes, it is possible to +run a number of truly independent Wine sessions. +.SH FILES +.TP +.B ~/.wine +Default location for the +.B wine +configuration data. +.SH AUTHORS +Many people have contributed to the development of Wine. Please check +the file Changelog in the Wine distribution for the complete details. +.SH BUGS +If you find a bug, please submit a bug report at +.UR http://bugs.winehq.org +.B http://bugs.winehq.org. +.UE +.SH AVAILABILITY +.B wineprefixcreate +is part of the Wine distribution, which is available through WineHQ, +the Wine development headquarters, at +.UR http://www.winehq.org/ +.B http://www.winehq.org/. +.UE +.br +It is distributed under the terms of the GNU Lesser General Public +License. +.SH "SEE ALSO" +.BR wine (1), +.BR wineserver (1).

1 0

Alexandre Julliard : Documentation updates.
by Alexandre Julliard 23 Aug '06

23 Aug '06

Module: wine Branch: master Commit: 4e4740346df5bccff744d0c389740cad62f2daa3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4e4740346df5bccff744d0c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 23 15:59:14 2006 +0200 Documentation updates. --- README | 56 +++++++++++++++++++++++----------------------------- loader/wine.man.in | 4 ++-- 2 files changed, 27 insertions(+), 33 deletions(-) diff --git a/README b/README index 029f592..2c4078f 100644 --- a/README +++ b/README @@ -10,6 +10,7 @@ be used for porting Win32 code into nati Wine is free software, released under the GNU LGPL; see the file LICENSE for the details. + 2. QUICK START Whenever you compile from source, it is recommended to use the Wine @@ -18,10 +19,11 @@ of the Wine source (which contains this ./tools/wineinstall -Run programs as "wine [options] program". For more information and -problem resolution, read the rest of this file, the Wine man page, and +Run programs as "wine program". For more information and problem +resolution, read the rest of this file, the Wine man page, and especially the wealth of information found at http://www.winehq.org. + 3. REQUIREMENTS To compile and run Wine, you must have one of the following: @@ -30,6 +32,7 @@ To compile and run Wine, you must have o FreeBSD 5.3 or later Solaris x86 2.5 or later NetBSD-current + MacOS X 10.4 or later As Wine requires kernel-level thread support to run, only the operating systems mentioned above are supported. @@ -58,6 +61,8 @@ NetBSD info: Make sure you have the USER_LDT, SYSVSHM, SYSVSEM, and SYSVMSG options turned on in your kernel. +MacOS info: + You need Xcode 2.4 or later to build properly on x86. Supported file systems: @@ -76,17 +81,16 @@ Build tool requirements: On x86 Systems gcc >= 2.7.2 is required. Versions earlier than 2.7.2.3 may have problems when certain files are compiled with optimization, often due to problems with header file - management. pgcc currently doesn't work with Wine. The cause of this problem - is unknown. + management. Of course you also need "make" (most likely GNU make). You also need flex version 2.5 or later and bison. Optional support libraries: - If you want CUPS printing support, please install both cups and cups-devel - packages. - Install the libxml2 package to get a functional msxml implementation. + Run ./configure --verbose to see the optional libraries that could + be used but aren't found on your system. + 4. COMPILATION @@ -108,12 +112,13 @@ To upgrade to a new release by using a p top-level directory of the release (the one containing this README file). Then do a "make clean", and patch the release with: - gunzip -c patch-file | patch -p1 + bunzip2 -c patch-file | patch -p1 where "patch-file" is the name of the patch file (something like -Wine-yymmdd.diff.gz). You can then re-run "./configure", and then +wine-0.9.x.diff.bz2). You can then re-run "./configure", and then run "make depend && make". + 5. SETUP Once Wine has been built correctly, you can do "make install"; this @@ -131,6 +136,7 @@ In case of library loading errors (e.g. "Error while loading shared libraries: libntdll.so"), make sure to add the library path to /etc/ld.so.conf and run ldconfig as root. + 6. RUNNING PROGRAMS When invoking Wine, you may specify the entire path to the executable, @@ -148,23 +154,11 @@ For example: to run Solitaire: wine sol.exe /parameter1 -parameter2 parameter3 (calling program with parameters) -Note: the path of the file will also be added to the path when - a full name is supplied on the commandline. - -Wine is not yet complete, so several programs may crash. Provided you set up -winedbg correctly according to documentation/debugger.sgml, you will be dropped -into a debugger so that you can investigate and fix the problem. -For more information on how to do this, please read the file -documentation/debugging.sgml. +Wine is not yet complete, so several programs may crash. In that crash +you will be dropped into the debugger so that you can investigate and +fix the problem. For more information on how to do this, please check +the debugging section of the Wine Developer's Guide. -You should backup all your important files that you give Wine access -to, or use a special Wine copy of them, as there have been some cases -of users reporting file corruption. Do NOT run Explorer, for instance, -if you don't have a proper backup, as it renames/cripples several -directories sometimes. Not even other MS apps such as e.g. Messenger are safe, -as they launch Explorer somehow. This particular corruption (!$!$!$!$.pfr) -can at least partially be fixed by using -http://home.nexgo.de/andi.mohr/download/decorrupt_explorer 7. GETTING MORE INFORMATION @@ -181,17 +175,17 @@ Bugs: Report bugs to Wine Bugzilla at ht Please search the bugzilla database to check whether your problem is already found before posting a bug report. You can also post bug reports to comp.emulators.ms-windows.wine. - Please read the file documentation/bugs.sgml to see what - information is required. IRC: Online help is available at channel #WineHQ on irc.freenode.net. -CVS: The current Wine development tree is available through CVS. - Go to http://www.winehq.org/cvs for more information. +GIT: The current Wine development tree is available through GIT. + Go to http://www.winehq.org/site/git for more information. Mailing lists: - There are several mailing lists for Wine developers; see - http://www.winehq.org/forums for more information. + There are several mailing lists for Wine users and developers; + see http://www.winehq.org/forums for more information. + +Wiki: The Wine Wiki is located at http://wiki.winehq.org If you add something, or fix a bug, please send a patch (in 'diff -u' format) to wine-patches(a)winehq.org list for inclusion in the next diff --git a/loader/wine.man.in b/loader/wine.man.in index 927bbe3..efc344b 100644 --- a/loader/wine.man.in +++ b/loader/wine.man.in @@ -280,10 +280,10 @@ The most recent public version of can be downloaded from .I http://www.winehq.org/download .PP -The latest snapshot of the code may be obtained via CVS. For information +The latest snapshot of the code may be obtained via GIT. For information on how to do this, please see .I -http://www.winehq.org/cvs +http://www.winehq.org/site/git .PP WineHQ, the .B wine

1 0