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

Kirill K. Smirnov : wineconsole: Implement GetConsoleWindow.
by Alexandre Julliard Aug. 24, 2007

Aug. 24, 2007

Module: wine Branch: master Commit: f3e13174c70f1887d92ba9f8774eb37e17eda1ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3e13174c70f1887d92ba9f87… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Thu Aug 23 19:17:17 2007 +0400 wineconsole: Implement GetConsoleWindow. --- dlls/kernel32/console.c | 12 +++++++++- include/wine/server_protocol.h | 35 +++++++++++++++++-------------- programs/wineconsole/wineconsole.c | 22 +++++++++++--------- server/console.c | 7 ++++++ server/protocol.def | 39 +++++++++++++++++++---------------- server/trace.c | 2 + 6 files changed, 71 insertions(+), 46 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 8da9f8c..32d0214 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -125,8 +125,16 @@ static void char_info_AtoW( CHAR_INFO *buffer, int count ) */ HWND WINAPI GetConsoleWindow(VOID) { - FIXME("stub\n"); - return NULL; + HWND hWnd = NULL; + + SERVER_START_REQ(get_console_input_info) + { + req->handle = 0; + if (!wine_server_call_err(req)) hWnd = reply->win; + } + SERVER_END_REQ; + + return hWnd; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 9c4bdb3..e0f7f8b 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1359,14 +1359,15 @@ struct set_console_mode_reply struct set_console_input_info_request { struct request_header __header; - obj_handle_t handle; - int mask; - obj_handle_t active_sb; - int history_mode; - int history_size; - int edition_mode; - int input_cp; - int output_cp; + obj_handle_t handle; + int mask; + obj_handle_t active_sb; + int history_mode; + int history_size; + int edition_mode; + int input_cp; + int output_cp; + user_handle_t win; /* VARARG(title,unicode_str); */ }; struct set_console_input_info_reply @@ -1380,23 +1381,25 @@ struct set_console_input_info_reply #define SET_CONSOLE_INPUT_INFO_EDITION_MODE 0x10 #define SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE 0x20 #define SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE 0x40 +#define SET_CONSOLE_INPUT_INFO_WIN 0x80 struct get_console_input_info_request { struct request_header __header; - obj_handle_t handle; + obj_handle_t handle; }; struct get_console_input_info_reply { struct reply_header __header; - int history_mode; - int history_size; - int history_index; - int edition_mode; - int input_cp; - int output_cp; + int history_mode; + int history_size; + int history_index; + int edition_mode; + int input_cp; + int output_cp; + user_handle_t win; /* VARARG(title,unicode_str); */ }; @@ -4727,6 +4730,6 @@ union generic_reply struct make_process_system_reply make_process_system_reply; }; -#define SERVER_PROTOCOL_VERSION 307 +#define SERVER_PROTOCOL_VERSION 309 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index b965465..449cb64 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -642,16 +642,6 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna if (!ret) goto error; WINE_TRACE("using hConIn %p, hSynchro event %p\n", data->hConIn, data->hSynchro); - SERVER_START_REQ( set_console_input_info ) - { - req->handle = data->hConIn; - req->mask = SET_CONSOLE_INPUT_INFO_TITLE; - wine_server_add_data( req, appname, lstrlenW(appname) * sizeof(WCHAR) ); - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - if (!ret) goto error; - SERVER_START_REQ(create_console_output) { req->handle_in = data->hConIn; @@ -679,6 +669,18 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna WINECON_SetConfig(data, &cfg); data->curcfg.registry = cfg.registry; WINECON_DumpConfig("fint", &data->curcfg); + SERVER_START_REQ( set_console_input_info ) + { + req->handle = data->hConIn; + req->win = data->hWnd; + req->mask = SET_CONSOLE_INPUT_INFO_TITLE | + SET_CONSOLE_INPUT_INFO_WIN; + wine_server_add_data( req, appname, lstrlenW(appname) * sizeof(WCHAR) ); + ret = !wine_server_call_err( req ); + } + SERVER_END_REQ; + if (!ret) goto error; + return data; case init_failed: break; diff --git a/server/console.c b/server/console.c index 88a24e8..b0a3424 100644 --- a/server/console.c +++ b/server/console.c @@ -63,6 +63,7 @@ struct console_input int edition_mode; /* index to edition mode flavors */ int input_cp; /* console input codepage */ int output_cp; /* console output codepage */ + user_handle_t win; /* window handle if backend supports it */ struct event *event; /* event to wait on for input queue */ }; @@ -281,6 +282,7 @@ static struct object *create_console_input( struct thread* renderer ) console_input->edition_mode = 0; console_input->input_cp = 0; console_input->output_cp = 0; + console_input->win = 0; console_input->event = create_event( NULL, NULL, 0, 1, 0 ); if (!console_input->history || !console_input->evt) @@ -719,6 +721,10 @@ static int set_console_input_info( const struct set_console_input_info_request * { console->output_cp = req->output_cp; } + if (req->mask & SET_CONSOLE_INPUT_INFO_WIN) + { + console->win = req->win; + } release_object( console ); return 1; error: @@ -1413,6 +1419,7 @@ DECL_HANDLER(get_console_input_info) reply->edition_mode = console->edition_mode; reply->input_cp = console->input_cp; reply->output_cp = console->output_cp; + reply->win = console->win; release_object( console ); } diff --git a/server/protocol.def b/server/protocol.def index e35c32a..6e13cb2 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1090,15 +1090,16 @@ struct console_renderer_event /* Set info about a console (input only) */ @REQ(set_console_input_info) - obj_handle_t handle; /* handle to console input, or 0 for process' console */ - int mask; /* setting mask (see below) */ - obj_handle_t active_sb; /* active screen buffer */ - int history_mode; /* whether we duplicate lines in history */ - int history_size; /* number of lines in history */ - int edition_mode; /* index to the edition mode flavors */ - int input_cp; /* console input codepage */ - int output_cp; /* console output codepage */ - VARARG(title,unicode_str); /* console title */ + obj_handle_t handle; /* handle to console input, or 0 for process' console */ + int mask; /* setting mask (see below) */ + obj_handle_t active_sb; /* active screen buffer */ + int history_mode; /* whether we duplicate lines in history */ + int history_size; /* number of lines in history */ + int edition_mode; /* index to the edition mode flavors */ + int input_cp; /* console input codepage */ + int output_cp; /* console output codepage */ + user_handle_t win; /* console window if backend supports it */ + VARARG(title,unicode_str); /* console title */ @END #define SET_CONSOLE_INPUT_INFO_ACTIVE_SB 0x01 #define SET_CONSOLE_INPUT_INFO_TITLE 0x02 @@ -1107,19 +1108,21 @@ struct console_renderer_event #define SET_CONSOLE_INPUT_INFO_EDITION_MODE 0x10 #define SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE 0x20 #define SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE 0x40 +#define SET_CONSOLE_INPUT_INFO_WIN 0x80 /* Get info about a console (input only) */ @REQ(get_console_input_info) - obj_handle_t handle; /* handle to console input, or 0 for process' console */ -(a)REPLY - int history_mode; /* whether we duplicate lines in history */ - int history_size; /* number of lines in history */ - int history_index; /* number of used lines in history */ - int edition_mode; /* index to the edition mode flavors */ - int input_cp; /* console input codepage */ - int output_cp; /* console output codepage */ - VARARG(title,unicode_str); /* console title */ + obj_handle_t handle; /* handle to console input, or 0 for process' console */ +(a)REPLY + int history_mode; /* whether we duplicate lines in history */ + int history_size; /* number of lines in history */ + int history_index; /* number of used lines in history */ + int edition_mode; /* index to the edition mode flavors */ + int input_cp; /* console input codepage */ + int output_cp; /* console output codepage */ + user_handle_t win; /* console window if backend supports it */ + VARARG(title,unicode_str); /* console title */ @END diff --git a/server/trace.c b/server/trace.c index e6f8847..d0c4e0e 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1473,6 +1473,7 @@ static void dump_set_console_input_info_request( const struct set_console_input_ fprintf( stderr, " edition_mode=%d,", req->edition_mode ); fprintf( stderr, " input_cp=%d,", req->input_cp ); fprintf( stderr, " output_cp=%d,", req->output_cp ); + fprintf( stderr, " win=%p,", req->win ); fprintf( stderr, " title=" ); dump_varargs_unicode_str( cur_size ); } @@ -1490,6 +1491,7 @@ static void dump_get_console_input_info_reply( const struct get_console_input_in fprintf( stderr, " edition_mode=%d,", req->edition_mode ); fprintf( stderr, " input_cp=%d,", req->input_cp ); fprintf( stderr, " output_cp=%d,", req->output_cp ); + fprintf( stderr, " win=%p,", req->win ); fprintf( stderr, " title=" ); dump_varargs_unicode_str( cur_size ); }

1 0

Kirill K. Smirnov : wineconsole: Move window handle to inner_data structure .
by Alexandre Julliard Aug. 24, 2007

Aug. 24, 2007

Module: wine Branch: master Commit: 945f4a794660e6da59c3078b8fc49fa0a66f1dd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=945f4a794660e6da59c3078b8… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Thu Aug 23 19:14:58 2007 +0400 wineconsole: Move window handle to inner_data structure. --- programs/wineconsole/curses.c | 1 + programs/wineconsole/dialog.c | 8 +- programs/wineconsole/user.c | 104 ++++++++++++++++---------------- programs/wineconsole/winecon_private.h | 1 + programs/wineconsole/winecon_user.h | 1 - 5 files changed, 58 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=945f4a794660e6da59c30…

1 0

James Hawkins : cabinet: Return the value of GetLastError if FDICopy fails.
by Alexandre Julliard Aug. 24, 2007

Aug. 24, 2007

Module: wine Branch: master Commit: 2918a272e3b4da3faa1e5b8fd84a83f84e1764b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2918a272e3b4da3faa1e5b8fd… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Aug 23 15:46:52 2007 -0700 cabinet: Return the value of GetLastError if FDICopy fails. --- dlls/cabinet/cabinet_main.c | 2 +- dlls/cabinet/fdi.c | 1 - dlls/cabinet/tests/extract.c | 11 ++++------- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c index 24be376..50ef06e 100644 --- a/dlls/cabinet/cabinet_main.c +++ b/dlls/cabinet/cabinet_main.c @@ -357,7 +357,7 @@ HRESULT WINAPI Extract(SESSION *dest, LPCSTR szCabName) if (!FDICopy(hfdi, name, path, 0, fdi_notify_extract, NULL, dest)) - res = E_FAIL; + res = HRESULT_FROM_WIN32(GetLastError()); HeapFree(GetProcessHeap(), 0, str); end: diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index ef00447..eea6218 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2495,7 +2495,6 @@ BOOL __cdecl FDICopy( cabhf = PFDI_OPEN(hfdi, fullpath, _O_RDONLY|_O_BINARY, _S_IREAD | _S_IWRITE); if (cabhf == -1) { PFDI_INT(hfdi)->perf->erfOper = FDIERROR_CABINET_NOT_FOUND; - PFDI_INT(hfdi)->perf->erfType = ERROR_FILE_NOT_FOUND; PFDI_INT(hfdi)->perf->fError = TRUE; SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; diff --git a/dlls/cabinet/tests/extract.c b/dlls/cabinet/tests/extract.c index 6fb5ad5..8cadfe2 100644 --- a/dlls/cabinet/tests/extract.c +++ b/dlls/cabinet/tests/extract.c @@ -572,13 +572,10 @@ static void test_Extract(void) session.Operation = EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES; res = pExtract(&session, "nonexistent.cab"); node = session.FileList; - todo_wine - { - ok(res == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), - "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %08x\n", res); - ok(session.Error.erfOper == FDIERROR_CABINET_NOT_FOUND, - "Expected FDIERROR_CABINET_NOT_FOUND, got %d\n", session.Error.erfOper); - } + ok(res == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), + "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %08x\n", res); + ok(session.Error.erfOper == FDIERROR_CABINET_NOT_FOUND, + "Expected FDIERROR_CABINET_NOT_FOUND, got %d\n", session.Error.erfOper); ok(session.FileSize == 0, "Expected 0, got %d\n", session.FileSize); ok(session.Error.erfType == 0, "Expected 0, got %d\n", session.Error.erfType); ok(session.Error.fError == TRUE, "Expected TRUE, got %d\n", session.Error.fError);

1 0

James Hawkins : cabinet: Append new file nodes to the front of the file list.
by Alexandre Julliard Aug. 24, 2007

Aug. 24, 2007

Module: wine Branch: master Commit: b1bd9208185813b3291e64032e8f5e23d8541566 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1bd9208185813b3291e64032… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Aug 23 14:42:27 2007 -0700 cabinet: Append new file nodes to the front of the file list. --- dlls/cabinet/cabinet_main.c | 34 +++++--- dlls/cabinet/tests/extract.c | 186 +++++++++++++++++++----------------------- 2 files changed, 106 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1bd9208185813b3291e6…

1 0

James Hawkins : cabinet: Pass the session Error to FDICopy.
by Alexandre Julliard Aug. 24, 2007

Aug. 24, 2007

Module: wine Branch: master Commit: 80e149d62c55a0dda782fdb63806f3ff1d138488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80e149d62c55a0dda782fdb63… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Aug 23 14:20:52 2007 -0700 cabinet: Pass the session Error to FDICopy. --- dlls/cabinet/cabinet_main.c | 3 +-- dlls/cabinet/tests/extract.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c index 8b3c621..aa46cf0 100644 --- a/dlls/cabinet/cabinet_main.c +++ b/dlls/cabinet/cabinet_main.c @@ -306,7 +306,6 @@ HRESULT WINAPI Extract(SESSION *dest, LPCSTR szCabName) { HRESULT res = S_OK; HFDI hfdi; - ERF erf; char *str, *path, *name; TRACE("(%p, %s)\n", dest, szCabName); @@ -319,7 +318,7 @@ HRESULT WINAPI Extract(SESSION *dest, LPCSTR szCabName) fdi_close, fdi_seek, cpuUNKNOWN, - &erf); + &dest->Error); if (!hfdi) return E_FAIL; diff --git a/dlls/cabinet/tests/extract.c b/dlls/cabinet/tests/extract.c index ad93fb8..b9df804 100644 --- a/dlls/cabinet/tests/extract.c +++ b/dlls/cabinet/tests/extract.c @@ -597,10 +597,10 @@ static void test_Extract(void) "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %08x\n", res); ok(session.Error.erfOper == FDIERROR_CABINET_NOT_FOUND, "Expected FDIERROR_CABINET_NOT_FOUND, got %d\n", session.Error.erfOper); - ok(session.Error.fError == TRUE, "Expected TRUE, got %d\n", session.Error.fError); } ok(session.FileSize == 0, "Expected 0, got %d\n", session.FileSize); ok(session.Error.erfType == 0, "Expected 0, got %d\n", session.Error.erfType); + ok(session.Error.fError == TRUE, "Expected TRUE, got %d\n", session.Error.fError); ok(session.FileCount == 0, "Expected 0, got %d\n", session.FileCount); ok(session.Operation == (EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES), "Expected EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES, got %d\n", session.Operation);

1 0

Bryan DeGrendel : mscoree: Return S_OK if mono runtime is found.
by Alexandre Julliard Aug. 24, 2007

Aug. 24, 2007

Module: wine Branch: master Commit: b76efcb61f0a6f47cffff56f9d3a0f88e7abc1f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b76efcb61f0a6f47cffff56f9… Author: Bryan DeGrendel <sirnuke(a)gmail.com> Date: Thu Aug 23 16:22:28 2007 -0400 mscoree: Return S_OK if mono runtime is found. --- dlls/mscoree/mscoree_main.c | 96 +++++++++++++++++++++++-------------------- 1 files changed, 52 insertions(+), 44 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 678b346..b3879c0 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -34,50 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); -HRESULT WINAPI CorBindToRuntimeHost(LPCWSTR pwszVersion, LPCWSTR pwszBuildFlavor, - LPCWSTR pwszHostConfigFile, VOID *pReserved, - DWORD startupFlags, REFCLSID rclsid, - REFIID riid, LPVOID *ppv) -{ - FIXME("(%s, %s, %s, %p, %d, %p, %p, %p): stub!\n", debugstr_w(pwszVersion), - debugstr_w(pwszBuildFlavor), debugstr_w(pwszHostConfigFile), pReserved, - startupFlags, rclsid, riid, ppv); - - return E_FAIL; -} - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - case DLL_PROCESS_DETACH: - break; - } - return TRUE; -} - -BOOL WINAPI _CorDllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - FIXME("(%p, %d, %p): stub\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - case DLL_PROCESS_DETACH: - break; - } - return TRUE; -} - static LPWSTR get_mono_exe(void) { static const WCHAR mono_exe[] = {'b','i','n','\\','m','o','n','o','.','e','x','e',' ',0}; @@ -126,6 +82,58 @@ static LPWSTR get_mono_exe(void) return ret; } +HRESULT WINAPI CorBindToRuntimeHost(LPCWSTR pwszVersion, LPCWSTR pwszBuildFlavor, + LPCWSTR pwszHostConfigFile, VOID *pReserved, + DWORD startupFlags, REFCLSID rclsid, + REFIID riid, LPVOID *ppv) +{ + WCHAR *mono_exe; + + FIXME("(%s, %s, %s, %p, %d, %p, %p, %p): semi-stub!\n", debugstr_w(pwszVersion), + debugstr_w(pwszBuildFlavor), debugstr_w(pwszHostConfigFile), pReserved, + startupFlags, rclsid, riid, ppv); + + if (!(mono_exe = get_mono_exe())) + { + MESSAGE("wine: Install the Windows version of Mono to run .NET executables\n"); + return E_FAIL; + } + + return S_OK; +} + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} + +BOOL WINAPI _CorDllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + FIXME("(%p, %d, %p): stub\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} + __int32 WINAPI _CorExeMain(void) { STARTUPINFOW si;

1 0

Mikolaj Zalewski : msvcrt: Test and fix _ismbslead and _ismbstrail.
by Alexandre Julliard Aug. 24, 2007

Aug. 24, 2007

Module: wine Branch: master Commit: 884d718c4985b34c943582db90de927af8999608 URL: http://source.winehq.org/git/wine.git/?a=commit;h=884d718c4985b34c943582db9… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Thu Aug 23 17:26:14 2007 -0700 msvcrt: Test and fix _ismbslead and _ismbstrail. --- dlls/msvcrt/mbcs.c | 29 ++++++++++++++++++----------- dlls/msvcrt/tests/string.c | 36 +++++++++++++++++++++++++++++++++++- 2 files changed, 53 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 718e387..91efadd 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1058,18 +1058,22 @@ int CDECL _ismbbtrail(unsigned int c) */ int CDECL _ismbslead(const unsigned char* start, const unsigned char* str) { - /* Lead bytes can also be trail bytes if caller messed up - * iterating through the string... + int lead = 0; + + if(!g_mbcp_is_multibyte) + return 0; + + /* Lead bytes can also be trail bytes so we need to analise the string */ - if(MSVCRT___mb_cur_max > 1) + while (start <= str) { - while(start < str) - start += MSVCRT_isleadbyte(*str) ? 2 : 1; - - if(start == str) - return MSVCRT_isleadbyte(*str); + if (!*start) + return 0; + lead = !lead && _ismbblead(*start); + start++; } - return 0; /* Must have been a trail, we skipped it */ + + return lead ? -1 : 0; } /********************************************************************* @@ -1077,8 +1081,11 @@ int CDECL _ismbslead(const unsigned char* start, const unsigned char* str) */ int CDECL _ismbstrail(const unsigned char* start, const unsigned char* str) { - /* Must not be a lead, and must be preceded by one */ - return !_ismbslead(start, str) && MSVCRT_isleadbyte(str[-1]); + /* Note: this function doesn't check _ismbbtrail */ + if ((str > start) && _ismbslead(start, str-1)) + return -1; + else + return 0; } /********************************************************************* diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 004d059..9199641 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -183,7 +183,7 @@ static void test_mbcp(void) int curr_mbcp = _getmbcp(); unsigned char *mbstring = (unsigned char *)"\xb0\xb1\xb2 \xb3\xb4 \xb5"; /* incorrect string */ unsigned char *mbstring2 = (unsigned char *)"\xb0\xb1\xb2\xb3Q\xb4\xb5"; /* correct string */ - unsigned char *mbsonlylead = (unsigned char *)"\xb0\0\xb1\xb2"; + unsigned char *mbsonlylead = (unsigned char *)"\xb0\0\xb1\xb2 \xb3"; unsigned char buf[16]; int step; @@ -205,6 +205,40 @@ static void test_mbcp(void) ok(_ismbbtrail('\xb0'), "\xa0 should be a trail byte\n"); ok(_ismbbtrail(' ') == FALSE, "' ' should not be a trail byte\n"); + /* _ismbslead */ + expect_eq(_ismbslead(mbstring, &mbstring[0]), -1, int, "%d"); + expect_eq(_ismbslead(mbstring, &mbstring[1]), FALSE, int, "%d"); + expect_eq(_ismbslead(mbstring, &mbstring[2]), -1, int, "%d"); + expect_eq(_ismbslead(mbstring, &mbstring[3]), FALSE, int, "%d"); + expect_eq(_ismbslead(mbstring, &mbstring[4]), -1, int, "%d"); + expect_eq(_ismbslead(mbstring, &mbstring[5]), FALSE, int, "%d"); + expect_eq(_ismbslead(mbstring, &mbstring[6]), FALSE, int, "%d"); + expect_eq(_ismbslead(mbstring, &mbstring[7]), -1, int, "%d"); + expect_eq(_ismbslead(mbstring, &mbstring[8]), FALSE, int, "%d"); + + expect_eq(_ismbslead(mbsonlylead, &mbsonlylead[0]), -1, int, "%d"); + expect_eq(_ismbslead(mbsonlylead, &mbsonlylead[1]), FALSE, int, "%d"); + expect_eq(_ismbslead(mbsonlylead, &mbsonlylead[2]), FALSE, int, "%d"); + expect_eq(_ismbslead(mbsonlylead, &mbsonlylead[5]), FALSE, int, "%d"); + + /* _ismbstrail */ + expect_eq(_ismbstrail(mbstring, &mbstring[0]), FALSE, int, "%d"); + expect_eq(_ismbstrail(mbstring, &mbstring[1]), -1, int, "%d"); + expect_eq(_ismbstrail(mbstring, &mbstring[2]), FALSE, int, "%d"); + expect_eq(_ismbstrail(mbstring, &mbstring[3]), -1, int, "%d"); + expect_eq(_ismbstrail(mbstring, &mbstring[4]), FALSE, int, "%d"); + expect_eq(_ismbstrail(mbstring, &mbstring[5]), -1, int, "%d"); + expect_eq(_ismbstrail(mbstring, &mbstring[6]), FALSE, int, "%d"); + expect_eq(_ismbstrail(mbstring, &mbstring[7]), FALSE, int, "%d"); + expect_eq(_ismbstrail(mbstring, &mbstring[8]), -1, int, "%d"); + + expect_eq(_ismbstrail(mbsonlylead, &mbsonlylead[0]), FALSE, int, "%d"); + expect_eq(_ismbstrail(mbsonlylead, &mbsonlylead[1]), -1, int, "%d"); + expect_eq(_ismbstrail(mbsonlylead, &mbsonlylead[2]), FALSE, int, "%d"); + expect_eq(_ismbstrail(mbsonlylead, &mbsonlylead[3]), FALSE, int, "%d"); + expect_eq(_ismbstrail(mbsonlylead, &mbsonlylead[4]), FALSE, int, "%d"); + expect_eq(_ismbstrail(mbsonlylead, &mbsonlylead[5]), FALSE, int, "%d"); + /* _mbsnextc */ expect_eq(_mbsnextc(mbstring), 0xb0b1, int, "%x"); expect_eq(_mbsnextc(&mbstring[2]), 0xb220, int, "%x"); /* lead + invalid tail */

1 0

Mikolaj Zalewski : msvcrt: Implement and test _mbsbtype.
by Alexandre Julliard Aug. 24, 2007

Aug. 24, 2007

Module: wine Branch: master Commit: 758539c8a3ddd75b6dff2a42752100ec75c833fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=758539c8a3ddd75b6dff2a427… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Thu Aug 23 18:11:43 2007 -0700 msvcrt: Implement and test _mbsbtype. --- dlls/msvcrt/mbcs.c | 32 ++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 18 ++++++++++++++++++ 3 files changed, 51 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 91efadd..258751e 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1089,6 +1089,38 @@ int CDECL _ismbstrail(const unsigned char* start, const unsigned char* str) } /********************************************************************* + * _mbsbtype (MSVCRT.@) + */ +int CDECL _mbsbtype(const unsigned char *str, MSVCRT_size_t count) +{ + int lead = 0; + const unsigned char *end = str + count; + int mbcp = g_mbcp_is_multibyte; + + /* Lead bytes can also be trail bytes so we need to analyse the string. + * Also we must return _MBC_ILLEGAL for chars past the end of the string + */ + while (str < end) /* Note: we skip the last byte - will check after the loop */ + { + if (!*str) + return _MBC_ILLEGAL; + lead = mbcp && !lead && _ismbblead(*str); + str++; + } + + if (lead) + if (_ismbbtrail(*str)) + return _MBC_TRAIL; + else + return _MBC_ILLEGAL; + else + if (_ismbblead(*str)) + return _MBC_LEAD; + else + return _MBC_SINGLE; +} + +/********************************************************************* * _mbsset(MSVCRT.@) */ unsigned char* CDECL _mbsset(unsigned char* str, unsigned int c) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index fc81898..1a516f0 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -355,7 +355,7 @@ @ stub _mbctombb #(long) @ cdecl _mbctoupper(long) @ extern _mbctype MSVCRT_mbctype -@ stub _mbsbtype #(str long) +@ cdecl _mbsbtype(str long) @ cdecl _mbscat(str str) @ cdecl _mbschr(str long) @ cdecl _mbscmp(str str) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 9199641..6dabc61 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -239,6 +239,24 @@ static void test_mbcp(void) expect_eq(_ismbstrail(mbsonlylead, &mbsonlylead[4]), FALSE, int, "%d"); expect_eq(_ismbstrail(mbsonlylead, &mbsonlylead[5]), FALSE, int, "%d"); + /* _mbsbtype */ + expect_eq(_mbsbtype(mbstring, 0), _MBC_LEAD, int, "%d"); + expect_eq(_mbsbtype(mbstring, 1), _MBC_TRAIL, int, "%d"); + expect_eq(_mbsbtype(mbstring, 2), _MBC_LEAD, int, "%d"); + expect_eq(_mbsbtype(mbstring, 3), _MBC_ILLEGAL, int, "%d"); + expect_eq(_mbsbtype(mbstring, 4), _MBC_LEAD, int, "%d"); + expect_eq(_mbsbtype(mbstring, 5), _MBC_TRAIL, int, "%d"); + expect_eq(_mbsbtype(mbstring, 6), _MBC_SINGLE, int, "%d"); + expect_eq(_mbsbtype(mbstring, 7), _MBC_LEAD, int, "%d"); + expect_eq(_mbsbtype(mbstring, 8), _MBC_ILLEGAL, int, "%d"); + + expect_eq(_mbsbtype(mbsonlylead, 0), _MBC_LEAD, int, "%d"); + expect_eq(_mbsbtype(mbsonlylead, 1), _MBC_ILLEGAL, int, "%d"); + expect_eq(_mbsbtype(mbsonlylead, 2), _MBC_ILLEGAL, int, "%d"); + expect_eq(_mbsbtype(mbsonlylead, 3), _MBC_ILLEGAL, int, "%d"); + expect_eq(_mbsbtype(mbsonlylead, 4), _MBC_ILLEGAL, int, "%d"); + expect_eq(_mbsbtype(mbsonlylead, 5), _MBC_ILLEGAL, int, "%d"); + /* _mbsnextc */ expect_eq(_mbsnextc(mbstring), 0xb0b1, int, "%x"); expect_eq(_mbsnextc(&mbstring[2]), 0xb220, int, "%x"); /* lead + invalid tail */

1 0

Detlef Riekenberg : winspool: Forward AddPrinterDriver to AddPrinterDriverEx.
by Alexandre Julliard Aug. 24, 2007

Aug. 24, 2007

Module: wine Branch: master Commit: b068ce5c2cde3aa531fea878e4f65e1dee4d11aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b068ce5c2cde3aa531fea878e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Aug 24 00:02:11 2007 +0200 winspool: Forward AddPrinterDriver to AddPrinterDriverEx. --- dlls/winspool.drv/info.c | 105 ++++++++++------------------------------------ 1 files changed, 22 insertions(+), 83 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index fee2210..ce5323b 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -4942,96 +4942,35 @@ BOOL WINAPI GetPrinterDriverDirectoryA(LPSTR pName, LPSTR pEnvironment, /***************************************************************************** * AddPrinterDriverA [WINSPOOL.@] + * + * See AddPrinterDriverW. + * */ BOOL WINAPI AddPrinterDriverA(LPSTR pName, DWORD level, LPBYTE pDriverInfo) { - DRIVER_INFO_3A di3; - HKEY hkeyDrivers, hkeyName; - static CHAR empty[] = "", - nullnull[] = "\0"; - - TRACE("(%s,%d,%p)\n",debugstr_a(pName),level,pDriverInfo); - - if(level != 2 && level != 3) { - SetLastError(ERROR_INVALID_LEVEL); - return FALSE; - } - if ((pName) && (pName[0])) { - FIXME("pName= %s - unsupported\n", debugstr_a(pName)); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - if(!pDriverInfo) { - WARN("pDriverInfo == NULL\n"); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - if(level == 3) - di3 = *(DRIVER_INFO_3A *)pDriverInfo; - else { - memset(&di3, 0, sizeof(di3)); - memcpy(&di3, pDriverInfo, sizeof(DRIVER_INFO_2A)); - } - - if(!di3.pName || !di3.pDriverPath || !di3.pConfigFile || - !di3.pDataFile) { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - 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); - - if(!hkeyDrivers) { - ERR("Can't create Drivers key\n"); - return FALSE; - } - - if(level == 2) { /* apparently can't overwrite with level2 */ - if(RegOpenKeyA(hkeyDrivers, di3.pName, &hkeyName) == ERROR_SUCCESS) { - RegCloseKey(hkeyName); - RegCloseKey(hkeyDrivers); - WARN("Trying to create existing printer driver %s\n", debugstr_a(di3.pName)); - SetLastError(ERROR_PRINTER_DRIVER_ALREADY_INSTALLED); - return FALSE; - } - } - if(RegCreateKeyA(hkeyDrivers, di3.pName, &hkeyName) != ERROR_SUCCESS) { - RegCloseKey(hkeyDrivers); - ERR("Can't create Name key\n"); - return FALSE; - } - RegSetValueExA(hkeyName, "Configuration File", 0, REG_SZ, (LPBYTE) di3.pConfigFile, - lstrlenA(di3.pConfigFile) + 1); - RegSetValueExA(hkeyName, "Data File", 0, REG_SZ, (LPBYTE) di3.pDataFile, lstrlenA(di3.pDataFile) + 1); - RegSetValueExA(hkeyName, "Driver", 0, REG_SZ, (LPBYTE) di3.pDriverPath, lstrlenA(di3.pDriverPath) + 1); - RegSetValueExA(hkeyName, "Version", 0, REG_DWORD, (LPBYTE) &di3.cVersion, - sizeof(DWORD)); - RegSetValueExA(hkeyName, "Datatype", 0, REG_SZ, (LPBYTE) di3.pDefaultDataType, lstrlenA(di3.pDefaultDataType)); - RegSetValueExA(hkeyName, "Dependent Files", 0, REG_MULTI_SZ, - (LPBYTE) di3.pDependentFiles, multi_sz_lenA(di3.pDependentFiles)); - RegSetValueExA(hkeyName, "Help File", 0, REG_SZ, (LPBYTE) di3.pHelpFile, lstrlenA(di3.pHelpFile) + 1); - RegSetValueExA(hkeyName, "Monitor", 0, REG_SZ, (LPBYTE) di3.pMonitorName, lstrlenA(di3.pMonitorName) + 1); - RegCloseKey(hkeyName); - RegCloseKey(hkeyDrivers); - - return TRUE; + TRACE("(%s, %d, %p)\n", debugstr_a(pName), level, pDriverInfo); + return AddPrinterDriverExA(pName, level, pDriverInfo, APD_COPY_NEW_FILES); } -/***************************************************************************** - * AddPrinterDriverW [WINSPOOL.@] +/****************************************************************************** + * AddPrinterDriverW (WINSPOOL.@) + * + * Install a Printer Driver + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * level [I] Level for the supplied DRIVER_INFO_*W struct + * pDriverInfo [I] PTR to DRIVER_INFO_*W struct with the Driver Parameter + * + * RESULTS + * Success: TRUE + * Failure: FALSE + * */ -BOOL WINAPI AddPrinterDriverW(LPWSTR printerName,DWORD level, - LPBYTE pDriverInfo) +BOOL WINAPI AddPrinterDriverW(LPWSTR pName, DWORD level, LPBYTE pDriverInfo) { - FIXME("(%s,%d,%p): stub\n",debugstr_w(printerName), - level,pDriverInfo); - return FALSE; + TRACE("(%s, %d, %p)\n", debugstr_w(pName), level, pDriverInfo); + return AddPrinterDriverExW(pName, level, pDriverInfo, APD_COPY_NEW_FILES); } /*****************************************************************************

1 0

Lei Zhang : gphoto2: Add missing brackets.
by Alexandre Julliard Aug. 24, 2007

Aug. 24, 2007

Module: wine Branch: master Commit: 4945a255e40d90b755cde1f35caea00f9d30009a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4945a255e40d90b755cde1f35… Author: Lei Zhang <thestig(a)google.com> Date: Thu Aug 23 13:21:31 2007 -0700 gphoto2: Add missing brackets. --- dlls/gphoto2.ds/ui.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gphoto2.ds/ui.c b/dlls/gphoto2.ds/ui.c index 7d43744..dd802fd 100644 --- a/dlls/gphoto2.ds/ui.c +++ b/dlls/gphoto2.ds/ui.c @@ -80,8 +80,10 @@ static int GetAllImages() LIST_FOR_EACH_ENTRY( file, &activeDS.files, struct gphoto2_file, entry) { if (strstr(file->filename,".JPG") || strstr(file->filename,".jpg")) + { file->download = TRUE; has_images = 1; + } } return has_images; }

1 0