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

Ge van Geldorp : winedbg: Adjust the parameters of the backend read/ write routines to
by Alexandre Julliard July 3, 2006

July 3, 2006

Module: wine Branch: refs/heads/master Commit: f0279726eb87576639bc2f2948eb6d76667949cb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f0279726eb87576639bc2f2… Author: Ge van Geldorp <ge(a)gse.nl> Date: Fri Jun 30 21:37:38 2006 +0200 winedbg: Adjust the parameters of the backend read/write routines to match those of ReadProcessMemory/WriteProcessMemory, since those are the ones actually used. --- programs/winedbg/be_alpha.c | 2 +- programs/winedbg/be_i386.c | 4 ++-- programs/winedbg/be_ppc.c | 4 ++-- programs/winedbg/debugger.h | 4 ++-- programs/winedbg/gdbproxy.c | 4 ++-- programs/winedbg/memory.c | 4 ++-- programs/winedbg/stack.c | 7 ++++++- 7 files changed, 17 insertions(+), 12 deletions(-) diff --git a/programs/winedbg/be_alpha.c b/programs/winedbg/be_alpha.c index 21c3bf2..8d2fb4d 100644 --- a/programs/winedbg/be_alpha.c +++ b/programs/winedbg/be_alpha.c @@ -87,7 +87,7 @@ static unsigned be_alpha_insert_Xpoint(H void* addr, unsigned long* val, unsigned size) { unsigned long xbp; - unsigned long sz; + SIZE_T sz; switch (type) { diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index c7521fe..e82216e 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -467,7 +467,7 @@ static unsigned be_i386_insert_Xpoint(HA void* addr, unsigned long* val, unsigned size) { unsigned char ch; - unsigned long sz; + SIZE_T sz; unsigned long* pr; int reg; unsigned long bits; @@ -517,7 +517,7 @@ static unsigned be_i386_remove_Xpoint(HA CONTEXT* ctx, enum be_xpoint_type type, void* addr, unsigned long val, unsigned size) { - unsigned long sz; + SIZE_T sz; unsigned char ch; switch (type) diff --git a/programs/winedbg/be_ppc.c b/programs/winedbg/be_ppc.c index db3b5d5..fcd92a7 100644 --- a/programs/winedbg/be_ppc.c +++ b/programs/winedbg/be_ppc.c @@ -100,7 +100,7 @@ static unsigned be_ppc_insert_Xpoint(HAN void* addr, unsigned long* val, unsigned size) { unsigned long xbp; - unsigned long sz; + SIZE_T sz; switch (type) { @@ -121,7 +121,7 @@ static unsigned be_ppc_remove_Xpoint(HAN CONTEXT* ctx, enum be_xpoint_type type, void* addr, unsigned long val, unsigned size) { - unsigned long sz; + SIZE_T sz; switch (type) { diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index c51ccc6..1452ff6 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -218,8 +218,8 @@ struct dbg_process struct be_process_io { BOOL (*close_process)(struct dbg_process*, BOOL); - BOOL (WINAPI *read)(HANDLE, const void*, void*, DWORD, DWORD*); - BOOL (WINAPI *write)(HANDLE, void*, const void*, DWORD, DWORD*); + BOOL (WINAPI *read)(HANDLE, const void*, void*, SIZE_T, SIZE_T*); + BOOL (WINAPI *write)(HANDLE, void*, const void*, SIZE_T, SIZE_T*); }; extern struct dbg_process* dbg_curr_process; diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 45a4522..e6b61e9 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1302,7 +1302,7 @@ static enum packet_return packet_read_me char *addr; unsigned int len, blk_len, nread; char buffer[32]; - unsigned long r = 0; + SIZE_T r = 0; assert(gdbctx->in_trap); /* FIXME:check in_packet_len for reading %p,%x */ @@ -1334,7 +1334,7 @@ static enum packet_return packet_write_m unsigned int len, blk_len; char* ptr; char buffer[32]; - unsigned long w; + SIZE_T w; assert(gdbctx->in_trap); ptr = memchr(gdbctx->in_packet, ':', gdbctx->in_packet_len); diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index fca6e3d..da964a4 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -231,7 +231,7 @@ #define DO_DUMP(_t,_l,_f) DO_DUMP2(_t,_l BOOL memory_get_string(struct dbg_process* pcs, void* addr, BOOL in_debuggee, BOOL unicode, char* buffer, int size) { - DWORD sz; + SIZE_T sz; WCHAR* buffW; buffer[0] = 0; @@ -262,7 +262,7 @@ BOOL memory_get_string(struct dbg_proces BOOL memory_get_string_indirect(struct dbg_process* pcs, void* addr, BOOL unicode, char* buffer, int size) { void* ad; - DWORD sz; + SIZE_T sz; buffer[0] = 0; if (addr && diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index b976117..c2dec5f 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -127,9 +127,14 @@ BOOL stack_get_current_symbol(SYMBOL_INF static BOOL CALLBACK stack_read_mem(HANDLE hProc, DWORD addr, PVOID buffer, DWORD size, PDWORD written) { + SIZE_T sz; + BOOL ret; + struct dbg_process* pcs = dbg_get_process_h(hProc); if (!pcs) return FALSE; - return pcs->process_io->read(hProc, (const void*)addr, buffer, size, written); + ret = pcs->process_io->read(hProc, (const void*)addr, buffer, size, &sz); + if (written != NULL) *written = sz; + return ret; } /******************************************************************

1 0

Mikołaj Zalewski : shell32: Add an icon for delete confirmation.
by Alexandre Julliard July 3, 2006

July 3, 2006

Module: wine Branch: refs/heads/master Commit: 89b458dac7213e75d1846d57681bff3aba4b90f3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=89b458dac7213e75d1846d5… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Fri Jun 30 22:50:28 2006 +0200 shell32: Add an icon for delete confirmation. --- dlls/shell32/.gitignore | 1 dlls/shell32/Makefile.in | 1 dlls/shell32/shlfileop.c | 8 +- dlls/shell32/shres.rc | 193 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shresdef.h | 1 5 files changed, 202 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=89b458dac7213e75d18…

1 0

Mikołaj Zalewski : shell32: Allow for custom icons in confirmation messages.
by Alexandre Julliard July 3, 2006

July 3, 2006

Module: wine Branch: refs/heads/master Commit: cb0c81ae8c7b5ee804ff3cdcf1b2c67b42b63b6f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cb0c81ae8c7b5ee804ff3cd… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Fri Jun 30 22:47:12 2006 +0200 shell32: Allow for custom icons in confirmation messages. --- dlls/shell32/shlfileop.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 242e252..90cf9e2 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -67,11 +67,15 @@ static DWORD SHFindAttrW(LPCWSTR pName, typedef struct { + HINSTANCE hIconInstance; + UINT icon_resource_id; UINT caption_resource_id, text_resource_id; } SHELL_ConfirmIDstruc; static BOOL SHELL_ConfirmIDs(int nKindOfDialog, SHELL_ConfirmIDstruc *ids) { + ids->hIconInstance = NULL; + ids->icon_resource_id = IDI_WARNING; switch (nKindOfDialog) { case ASK_DELETE_FILE: ids->caption_resource_id = IDS_DELETEITEM_CAPTION; @@ -99,6 +103,7 @@ BOOL SHELL_ConfirmDialogW(HWND hWnd, int { WCHAR szCaption[255], szText[255], szBuffer[MAX_PATH + 256]; SHELL_ConfirmIDstruc ids; + MSGBOXPARAMSW params; if (!SHELL_ConfirmIDs(nKindOfDialog, &ids)) return FALSE; @@ -109,7 +114,16 @@ BOOL SHELL_ConfirmDialogW(HWND hWnd, int FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, szText, 0, 0, szBuffer, sizeof(szBuffer), (va_list*)&szDir); - return (IDOK == MessageBoxW(hWnd, szBuffer, szCaption, MB_OKCANCEL | MB_ICONEXCLAMATION)); + ZeroMemory(&params, sizeof(params)); + params.cbSize = sizeof(MSGBOXPARAMSW); + params.hwndOwner = hWnd; + params.hInstance = ids.hIconInstance; + params.lpszText = szBuffer; + params.lpszCaption = szCaption; + params.lpszIcon = (LPWSTR)MAKEINTRESOURCE(ids.icon_resource_id); + params.dwStyle = MB_OKCANCEL | MB_USERICON; + + return (IDOK == MessageBoxIndirectW(&params)); } static DWORD SHELL32_AnsiToUnicodeBuf(LPCSTR aPath, LPWSTR *wPath, DWORD minChars)

1 0

Mikołaj Zalewski : shell32: Remove the now unused SHELL_DeleteFileW.
by Alexandre Julliard July 3, 2006

July 3, 2006

Module: wine Branch: refs/heads/master Commit: 9078c6af455468165457e40c6bcce748b80d5fb0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9078c6af455468165457e40… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Fri Jun 30 22:40:23 2006 +0200 shell32: Remove the now unused SHELL_DeleteFileW. --- dlls/shell32/shlfileop.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 4651614..76e9d8e 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -175,17 +175,6 @@ BOOL SHELL_DeleteDirectoryW(LPCWSTR pszD } /************************************************************************** - * SHELL_DeleteFileW() [internal] - */ -BOOL SHELL_DeleteFileW(LPCWSTR pszFile, BOOL bShowUI) -{ - if (bShowUI && !SHELL_ConfirmDialogW(ASK_DELETE_FILE, pszFile)) - return FALSE; - - return (SHNotifyDeleteFileW(pszFile) == ERROR_SUCCESS); -} - -/************************************************************************** * Win32CreateDirectory [SHELL32.93] * * Creates a directory. Also triggers a change notify if one exists.

1 0

Mikołaj Zalewski : shell32: Pass the correct parent hwnd to confirmation dialogs.
by Alexandre Julliard July 3, 2006

July 3, 2006

Module: wine Branch: refs/heads/master Commit: e5b9a79cbc18a42eabf195aaa57c58aeeeae04fa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e5b9a79cbc18a42eabf195a… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Fri Jun 30 22:43:12 2006 +0200 shell32: Pass the correct parent hwnd to confirmation dialogs. --- dlls/shell32/shell32_main.h | 5 ++--- dlls/shell32/shlfileop.c | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index e13c850..cc021d1 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -148,9 +148,8 @@ #define ASK_DELETE_MULTIPLE_ITEM 3 #define ASK_CREATE_FOLDER 4 #define ASK_OVERWRITE_FILE 5 -BOOL SHELL_DeleteDirectoryW(LPCWSTR pwszDir, BOOL bShowUI); -BOOL SHELL_DeleteFileW(LPCWSTR pwszFile, BOOL bShowUI); -BOOL SHELL_ConfirmDialogW(int nKindOfDialog, LPCWSTR szDir); +BOOL SHELL_DeleteDirectoryW(HWND hwnd, LPCWSTR pwszDir, BOOL bShowUI); +BOOL SHELL_ConfirmDialogW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir); /* 16-bit functions */ void WINAPI DragAcceptFiles16(HWND16 hWnd, BOOL16 b); diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 76e9d8e..242e252 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -95,7 +95,7 @@ static BOOL SHELL_ConfirmIDs(int nKindOf return FALSE; } -BOOL SHELL_ConfirmDialogW(int nKindOfDialog, LPCWSTR szDir) +BOOL SHELL_ConfirmDialogW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir) { WCHAR szCaption[255], szText[255], szBuffer[MAX_PATH + 256]; SHELL_ConfirmIDstruc ids; @@ -109,7 +109,7 @@ BOOL SHELL_ConfirmDialogW(int nKindOfDia FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, szText, 0, 0, szBuffer, sizeof(szBuffer), (va_list*)&szDir); - return (IDOK == MessageBoxW(GetActiveWindow(), szBuffer, szCaption, MB_OKCANCEL | MB_ICONEXCLAMATION)); + return (IDOK == MessageBoxW(hWnd, szBuffer, szCaption, MB_OKCANCEL | MB_ICONEXCLAMATION)); } static DWORD SHELL32_AnsiToUnicodeBuf(LPCSTR aPath, LPWSTR *wPath, DWORD minChars) @@ -139,7 +139,7 @@ static void SHELL32_FreeUnicodeBuf(LPWST * Asks for confirmation when bShowUI is true and deletes the directory and * all its subdirectories and files if necessary. */ -BOOL SHELL_DeleteDirectoryW(LPCWSTR pszDir, BOOL bShowUI) +BOOL SHELL_DeleteDirectoryW(HWND hwnd, LPCWSTR pszDir, BOOL bShowUI) { BOOL ret = TRUE; HANDLE hFind; @@ -152,7 +152,7 @@ BOOL SHELL_DeleteDirectoryW(LPCWSTR pszD if (hFind == INVALID_HANDLE_VALUE) return FALSE; - if (!bShowUI || (ret = SHELL_ConfirmDialogW(ASK_DELETE_FOLDER, pszDir))) + if (!bShowUI || (ret = SHELL_ConfirmDialogW(hwnd, ASK_DELETE_FOLDER, pszDir))) { do { @@ -163,7 +163,7 @@ BOOL SHELL_DeleteDirectoryW(LPCWSTR pszD continue; PathCombineW(szTemp, pszDir, lp); if (FILE_ATTRIBUTE_DIRECTORY & wfd.dwFileAttributes) - ret = SHELL_DeleteDirectoryW(szTemp, FALSE); + ret = SHELL_DeleteDirectoryW(hwnd, szTemp, FALSE); else ret = (SHNotifyDeleteFileW(szTemp) == ERROR_SUCCESS); } while (ret && FindNextFileW(hFind, &wfd)); @@ -1032,7 +1032,7 @@ static HRESULT copy_files(LPSHFILEOPSTRU return ERROR_SUCCESS; } -static BOOL confirm_delete_list(DWORD fFlags, FILE_LIST *flFrom) +static BOOL confirm_delete_list(HWND hWnd, DWORD fFlags, FILE_LIST *flFrom) { if (flFrom->dwNumFiles > 1) { @@ -1040,16 +1040,16 @@ static BOOL confirm_delete_list(DWORD fF const WCHAR format[] = {'%','d',0}; wnsprintfW(tmp, sizeof(tmp)/sizeof(tmp[0]), format, flFrom->dwNumFiles); - return SHELL_ConfirmDialogW(ASK_DELETE_MULTIPLE_ITEM, tmp); + return SHELL_ConfirmDialogW(hWnd, ASK_DELETE_MULTIPLE_ITEM, tmp); } else { FILE_ENTRY *fileEntry = &flFrom->feFiles[0]; if (IsAttribFile(fileEntry->attributes)) - return SHELL_ConfirmDialogW(ASK_DELETE_FILE, fileEntry->szFullPath); + return SHELL_ConfirmDialogW(hWnd, ASK_DELETE_FILE, fileEntry->szFullPath); else if (!(fFlags & FOF_FILESONLY && fileEntry->bFromWildcard)) - return SHELL_ConfirmDialogW(ASK_DELETE_FOLDER, fileEntry->szFullPath); + return SHELL_ConfirmDialogW(hWnd, ASK_DELETE_FOLDER, fileEntry->szFullPath); } return TRUE; } @@ -1065,7 +1065,7 @@ static HRESULT delete_files(LPSHFILEOPST return ERROR_SUCCESS; if (!(lpFileOp->fFlags & FOF_NOCONFIRMATION) || (lpFileOp->fFlags & FOF_WANTNUKEWARNING)) - if (!confirm_delete_list(lpFileOp->fFlags, flFrom)) + if (!confirm_delete_list(lpFileOp->hwnd, lpFileOp->fFlags, flFrom)) { lpFileOp->fAnyOperationsAborted = TRUE; return 0; @@ -1080,7 +1080,7 @@ static HRESULT delete_files(LPSHFILEOPST if (IsAttribFile(fileEntry->attributes)) bPathExists = DeleteFileW(fileEntry->szFullPath); else if (!(lpFileOp->fFlags & FOF_FILESONLY && fileEntry->bFromWildcard)) - bPathExists = SHELL_DeleteDirectoryW(fileEntry->szFullPath, FALSE); + bPathExists = SHELL_DeleteDirectoryW(lpFileOp->hwnd, fileEntry->szFullPath, FALSE); if (!bPathExists) return ERROR_PATH_NOT_FOUND;

1 0

Robert Shearman : advapi32: Implement RegisterServiceCtrlHandleExW.
by Alexandre Julliard July 3, 2006

July 3, 2006

Module: wine Branch: refs/heads/master Commit: 19d4378a5487f5b2eeb465bf70ef359c354c0740 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=19d4378a5487f5b2eeb465b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jun 30 11:06:59 2006 +0100 advapi32: Implement RegisterServiceCtrlHandleExW. --- dlls/advapi32/service.c | 46 +++++++++++++++++++++++++++++++++++++--------- 1 files changed, 37 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 08adf89..2ceb8a2 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -57,10 +57,15 @@ #define WINESERV_SENDCONTROL 3 typedef struct service_data_t { struct service_data_t *next; - LPHANDLER_FUNCTION handler; + union { + LPHANDLER_FUNCTION handler; + LPHANDLER_FUNCTION_EX handler_ex; + } handler; + LPVOID context; SERVICE_STATUS status; HANDLE thread; - BOOL unicode; + BOOL unicode : 1; + BOOL extended : 1; /* uses handler_ex instead of handler? */ union { LPSERVICE_MAIN_FUNCTIONA a; LPSERVICE_MAIN_FUNCTIONW w; @@ -573,7 +578,7 @@ static BOOL service_accepts_control(serv if (a&SERVICE_ACCEPT_NETBINDCHANGE) return TRUE; } - if (1) /* (!service->handlerex) */ + if (!service->extended) return FALSE; switch (dwControl) { @@ -603,10 +608,18 @@ static BOOL service_handle_control(HANDL TRACE("received control %ld\n", dwControl); - if (service_accepts_control(service, dwControl) && service->handler) + if (service_accepts_control(service, dwControl)) { - service->handler(dwControl); - ret = ERROR_SUCCESS; + if (service->extended && service->handler.handler) + { + service->handler.handler(dwControl); + ret = ERROR_SUCCESS; + } + else if (service->handler.handler_ex) + { + service->handler.handler_ex(dwControl, 0, NULL, service->context); + ret = ERROR_SUCCESS; + } } return WriteFile(pipe, &ret, sizeof ret, &count, NULL); } @@ -886,7 +899,7 @@ SERVICE_STATUS_HANDLE WINAPI RegisterSer if(!strcmpW(lpServiceName, service->name)) break; if (service) - service->handler = lpfHandler; + service->handler.handler = lpfHandler; LeaveCriticalSection( &service_cs ); return (SERVICE_STATUS_HANDLE)service; @@ -2251,6 +2264,21 @@ SERVICE_STATUS_HANDLE WINAPI RegisterSer SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExW( LPCWSTR lpServiceName, LPHANDLER_FUNCTION_EX lpHandlerProc, LPVOID lpContext ) { - FIXME("%s %p %p\n", debugstr_w(lpServiceName), lpHandlerProc, lpContext); - return 0; + service_data *service; + + TRACE("%s %p %p\n", debugstr_w(lpServiceName), lpHandlerProc, lpContext); + + EnterCriticalSection( &service_cs ); + for(service = service_list; service; service = service->next) + if(!strcmpW(lpServiceName, service->name)) + break; + if (service) + { + service->handler.handler_ex = lpHandlerProc; + service->context = lpContext; + service->extended = TRUE; + } + LeaveCriticalSection( &service_cs ); + + return (SERVICE_STATUS_HANDLE)service; }

1 0

Robert Shearman : oleaut32: Fix parsing of hex numbers with 'e' in the string by moving
by Alexandre Julliard July 3, 2006

July 3, 2006

Module: wine Branch: refs/heads/master Commit: 123592f0c314efc801724a524a96f091857a6ae0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=123592f0c314efc801724a5… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Jul 1 13:28:52 2006 +0100 oleaut32: Fix parsing of hex numbers with 'e' in the string by moving the exponent parsing to after the hex digit parsing. --- dlls/oleaut32/tests/vartest.c | 8 +++++--- dlls/oleaut32/variant.c | 35 ++++++++++++++++++----------------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index e8e4654..51c75e2 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -957,13 +957,15 @@ static void test_VarParseNumFromStr(void EXPECTRGB(4,FAILDIG); /* VB hex lower case and leading zero */ - CONVERT("&h0abcd", NUMPRS_HEX_OCT); - EXPECT(4,NUMPRS_HEX_OCT,0x40,7,4,0); + CONVERT("&h0abcdef", NUMPRS_HEX_OCT); + EXPECT(6,NUMPRS_HEX_OCT,0x40,9,4,0); EXPECTRGB(0,10); EXPECTRGB(1,11); EXPECTRGB(2,12); EXPECTRGB(3,13); - EXPECTRGB(4,FAILDIG); + EXPECTRGB(4,14); + EXPECTRGB(5,15); + EXPECTRGB(6,FAILDIG); /* VB oct */ CONVERT("&O300", NUMPRS_HEX_OCT); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index ddeeabb..5ea767f 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1732,23 +1732,6 @@ HRESULT WINAPI VarParseNumFromStr(OLECHA } } } - else if ((*lpszStr == 'e' || *lpszStr == 'E') && - pNumprs->dwInFlags & NUMPRS_EXPONENT && - !(pNumprs->dwOutFlags & NUMPRS_EXPONENT)) - { - dwState |= B_PROCESSING_EXPONENT; - pNumprs->dwOutFlags |= NUMPRS_EXPONENT; - cchUsed++; - } - else if (dwState & B_PROCESSING_EXPONENT && *lpszStr == chars.cPositiveSymbol) - { - cchUsed++; /* Ignore positive exponent */ - } - else if (dwState & B_PROCESSING_EXPONENT && *lpszStr == chars.cNegativeSymbol) - { - dwState |= B_NEGATIVE_EXPONENT; - cchUsed++; - } else if (((*lpszStr >= 'a' && *lpszStr <= 'f') || (*lpszStr >= 'A' && *lpszStr <= 'F')) && dwState & B_PROCESSING_HEX) @@ -1767,6 +1750,23 @@ HRESULT WINAPI VarParseNumFromStr(OLECHA pNumprs->cDig++; cchUsed++; } + else if ((*lpszStr == 'e' || *lpszStr == 'E') && + pNumprs->dwInFlags & NUMPRS_EXPONENT && + !(pNumprs->dwOutFlags & NUMPRS_EXPONENT)) + { + dwState |= B_PROCESSING_EXPONENT; + pNumprs->dwOutFlags |= NUMPRS_EXPONENT; + cchUsed++; + } + else if (dwState & B_PROCESSING_EXPONENT && *lpszStr == chars.cPositiveSymbol) + { + cchUsed++; /* Ignore positive exponent */ + } + else if (dwState & B_PROCESSING_EXPONENT && *lpszStr == chars.cNegativeSymbol) + { + dwState |= B_NEGATIVE_EXPONENT; + cchUsed++; + } else break; /* Stop at an unrecognised character */ @@ -1783,6 +1783,7 @@ HRESULT WINAPI VarParseNumFromStr(OLECHA if (pNumprs->dwOutFlags & NUMPRS_EXPONENT && dwState & B_PROCESSING_EXPONENT) { pNumprs->cchUsed = cchUsed; + WARN("didn't completely parse exponent\n"); return DISP_E_TYPEMISMATCH; /* Failed to completely parse the exponent */ }

1 0