July 2024 - Wine-commits - list.winehq.org

Elizabeth Figura : setupapi: Correctly interpret the INFCONTEXT parameter in SetupGetSourceFileLocation().
by Alexandre Julliard 15 Jul '24

15 Jul '24

Module: wine Branch: master Commit: bdb04298254954514e2232b1ce0f3d9418e61e12 URL: https://gitlab.winehq.org/wine/wine/-/commit/bdb04298254954514e2232b1ce0f3d… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Jul 15 16:34:29 2024 -0500 setupapi: Correctly interpret the INFCONTEXT parameter in SetupGetSourceFileLocation(). --- dlls/setupapi/query.c | 24 +++++++++++++++++++++--- dlls/setupapi/tests/query.c | 14 +++++++------- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index 88efea17473..c94fec77124 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -413,9 +413,27 @@ BOOL WINAPI SetupGetSourceFileLocationW( HINF hinf, PINFCONTEXT context, PCWSTR TRACE("%p, %p, %s, %p, %p, 0x%08lx, %p\n", hinf, context, debugstr_w(filename), source_id, buffer, buffer_size, required_size); - if (!context) context = &ctx; + if (context) + { + WCHAR *ctx_filename; + DWORD filename_size; + + if (!SetupGetStringFieldW( context, 1, NULL, 0, &filename_size )) + return FALSE; + if (!(ctx_filename = malloc( filename_size * sizeof(WCHAR) ))) + return FALSE; + SetupGetStringFieldW( context, 1, ctx_filename, filename_size, NULL ); + + source_id_str = get_source_id( hinf, &ctx, ctx_filename ); + + free( ctx_filename ); + } + else + { + source_id_str = get_source_id( hinf, &ctx, filename ); + } - if (!(source_id_str = get_source_id( hinf, context, filename ))) + if (!source_id_str) return FALSE; *source_id = wcstol( source_id_str, &end, 10 ); @@ -426,7 +444,7 @@ BOOL WINAPI SetupGetSourceFileLocationW( HINF hinf, PINFCONTEXT context, PCWSTR } free( source_id_str ); - if (SetupGetStringFieldW( context, 4, buffer, buffer_size, required_size )) + if (SetupGetStringFieldW( &ctx, 4, buffer, buffer_size, required_size )) return TRUE; if (required_size) *required_size = 1; diff --git a/dlls/setupapi/tests/query.c b/dlls/setupapi/tests/query.c index 145ca6e12eb..8f4400b802e 100644 --- a/dlls/setupapi/tests/query.c +++ b/dlls/setupapi/tests/query.c @@ -356,12 +356,12 @@ static void test_SetupGetSourceFileLocation(void) ret = SetupGetSourceFileLocationA(hinf, &ctx, "two.txt", &source_id, buffer, sizeof(buffer), NULL); ok(ret, "Got error %lu.\n", GetLastError()); - todo_wine ok(source_id == 2, "Got source id %u.\n", source_id); - todo_wine ok(!strcmp(buffer, ""), "Got relative path %s.\n", debugstr_a(buffer)); + ok(source_id == 2, "Got source id %u.\n", source_id); + ok(!strcmp(buffer, ""), "Got relative path %s.\n", debugstr_a(buffer)); /* ctx should not be changed. */ ret = SetupGetLineTextA(&ctx, NULL, NULL, NULL, buffer, sizeof(buffer), NULL); - todo_wine ok(!strcmp(buffer, "one.txt,,2"), "Got line %s.\n", debugstr_a(buffer)); + ok(!strcmp(buffer, "one.txt,,2"), "Got line %s.\n", debugstr_a(buffer)); /* Test when the source name differs from the destination name. * It seems SetupGetSourceFileLocation() is buggy and doesn't take that @@ -370,18 +370,18 @@ static void test_SetupGetSourceFileLocation(void) ret = SetupFindNextLine(&ctx, &ctx); ok(ret, "Got error %lu.\n", GetLastError()); ret = SetupFindNextLine(&ctx, &ctx); - todo_wine ok(ret, "Got error %lu.\n", GetLastError()); + ok(ret, "Got error %lu.\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetupGetSourceFileLocationA(hinf, &ctx, "two.txt", &source_id, buffer, sizeof(buffer), NULL); - todo_wine ok(!ret, "Expected failure.\n"); - todo_wine ok(GetLastError() == ERROR_LINE_NOT_FOUND, "Got error %lu.\n", GetLastError()); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_LINE_NOT_FOUND, "Got error %lu.\n", GetLastError()); ret = SetupFindNextLine(&ctx, &ctx); ok(ret, "Got error %lu.\n", GetLastError()); ret = SetupGetSourceFileLocationA(hinf, &ctx, "two.txt", &source_id, buffer, sizeof(buffer), NULL); - ok(ret, "Got error %lu.\n", GetLastError()); + todo_wine ok(ret, "Got error %lu.\n", GetLastError()); todo_wine ok(source_id == 10, "Got source id %u.\n", source_id); todo_wine ok(!strcmp(buffer, ""), "Got relative path %s.\n", debugstr_a(buffer));

1 0

Elizabeth Figura : setupapi: Return the file's relative path from SetupGetSourceFileLocation().
by Alexandre Julliard 15 Jul '24

15 Jul '24

Module: wine Branch: master Commit: 56089f60ed1d66c68338bb150b29ac16e13248d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/56089f60ed1d66c68338bb150b29ac… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Jul 15 16:34:29 2024 -0500 setupapi: Return the file's relative path from SetupGetSourceFileLocation(). --- dlls/setupapi/query.c | 8 +------- dlls/setupapi/tests/query.c | 14 +++++++------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index c94fec77124..40ec30ae11f 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -390,12 +390,6 @@ static LPWSTR get_source_id( HINF hinf, PINFCONTEXT context, PCWSTR filename ) return NULL; } - if (!SetupFindFirstLineW( hinf, source_disks_names_platform, source_id, context ) && - !SetupFindFirstLineW( hinf, source_disks_names, source_id, context )) - { - free( source_id ); - return NULL; - } return source_id; } @@ -444,7 +438,7 @@ BOOL WINAPI SetupGetSourceFileLocationW( HINF hinf, PINFCONTEXT context, PCWSTR } free( source_id_str ); - if (SetupGetStringFieldW( &ctx, 4, buffer, buffer_size, required_size )) + if (SetupGetStringFieldW( &ctx, 2, buffer, buffer_size, required_size )) return TRUE; if (required_size) *required_size = 1; diff --git a/dlls/setupapi/tests/query.c b/dlls/setupapi/tests/query.c index 8f4400b802e..d5de41b368a 100644 --- a/dlls/setupapi/tests/query.c +++ b/dlls/setupapi/tests/query.c @@ -349,7 +349,7 @@ static void test_SetupGetSourceFileLocation(void) ret = SetupGetSourceFileLocationA(hinf, NULL, "two.txt", &source_id, buffer, sizeof(buffer), NULL); ok(ret, "Got error %lu.\n", GetLastError()); ok(source_id == 4, "Got source id %u.\n", source_id); - todo_wine ok(!strcmp(buffer, "there"), "Got relative path %s.\n", debugstr_a(buffer)); + ok(!strcmp(buffer, "there"), "Got relative path %s.\n", debugstr_a(buffer)); ret = SetupFindFirstLineA(hinf, "copy_section", NULL, &ctx); ok(ret, "Got error %lu.\n", GetLastError()); @@ -381,14 +381,14 @@ static void test_SetupGetSourceFileLocation(void) ok(ret, "Got error %lu.\n", GetLastError()); ret = SetupGetSourceFileLocationA(hinf, &ctx, "two.txt", &source_id, buffer, sizeof(buffer), NULL); - todo_wine ok(ret, "Got error %lu.\n", GetLastError()); - todo_wine ok(source_id == 10, "Got source id %u.\n", source_id); - todo_wine ok(!strcmp(buffer, ""), "Got relative path %s.\n", debugstr_a(buffer)); + ok(ret, "Got error %lu.\n", GetLastError()); + ok(source_id == 10, "Got source id %u.\n", source_id); + ok(!strcmp(buffer, ""), "Got relative path %s.\n", debugstr_a(buffer)); ret = SetupGetSourceFileLocationA(hinf, NULL, "three.txt", &source_id, buffer, sizeof(buffer), NULL); - todo_wine ok(ret, "Got error %lu.\n", GetLastError()); - todo_wine ok(source_id == 6, "Got source id %u.\n", source_id); - todo_wine ok(!strcmp(buffer, ""), "Got relative path %s.\n", debugstr_a(buffer)); + ok(ret, "Got error %lu.\n", GetLastError()); + ok(source_id == 6, "Got source id %u.\n", source_id); + ok(!strcmp(buffer, ""), "Got relative path %s.\n", debugstr_a(buffer)); SetLastError(0xdeadbeef); ret = SetupGetSourceFileLocationA(hinf, NULL, "four.txt", &source_id, buffer, sizeof(buffer), NULL);

1 0

Elizabeth Figura : setupapi: Use SetupGetIntField() in SetupGetSourceFileLocation().
by Alexandre Julliard 15 Jul '24

15 Jul '24

Module: wine Branch: master Commit: 8070ed27bc4bb8c9c43c20734d340b62b379fcfc URL: https://gitlab.winehq.org/wine/wine/-/commit/8070ed27bc4bb8c9c43c20734d340b… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Jul 15 16:34:30 2024 -0500 setupapi: Use SetupGetIntField() in SetupGetSourceFileLocation(). --- dlls/setupapi/query.c | 50 ++++++++++++++------------------------------------ 1 file changed, 14 insertions(+), 36 deletions(-) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index 40ec30ae11f..707492ac984 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -369,30 +369,6 @@ BOOL WINAPI SetupGetSourceFileLocationA( HINF hinf, PINFCONTEXT context, PCSTR f return ret; } -static LPWSTR get_source_id( HINF hinf, PINFCONTEXT context, PCWSTR filename ) -{ - DWORD size; - LPWSTR source_id; - - if (!SetupFindFirstLineW( hinf, source_disks_files_platform, filename, context ) && - !SetupFindFirstLineW( hinf, source_disks_files, filename, context )) - return NULL; - - if (!SetupGetStringFieldW( context, 1, NULL, 0, &size )) - return NULL; - - if (!(source_id = malloc( size * sizeof(WCHAR) ))) - return NULL; - - if (!SetupGetStringFieldW( context, 1, source_id, size, NULL )) - { - free( source_id ); - return NULL; - } - - return source_id; -} - /*********************************************************************** * SetupGetSourceFileLocationW (SETUPAPI.@) */ @@ -402,7 +378,7 @@ BOOL WINAPI SetupGetSourceFileLocationW( HINF hinf, PINFCONTEXT context, PCWSTR PDWORD required_size ) { INFCONTEXT ctx; - WCHAR *end, *source_id_str; + int id; TRACE("%p, %p, %s, %p, %p, 0x%08lx, %p\n", hinf, context, debugstr_w(filename), source_id, buffer, buffer_size, required_size); @@ -418,25 +394,27 @@ BOOL WINAPI SetupGetSourceFileLocationW( HINF hinf, PINFCONTEXT context, PCWSTR return FALSE; SetupGetStringFieldW( context, 1, ctx_filename, filename_size, NULL ); - source_id_str = get_source_id( hinf, &ctx, ctx_filename ); + if (!SetupFindFirstLineW( hinf, source_disks_files_platform, ctx_filename, &ctx ) && + !SetupFindFirstLineW( hinf, source_disks_files, ctx_filename, &ctx )) + { + free( ctx_filename ); + return FALSE; + } free( ctx_filename ); } else { - source_id_str = get_source_id( hinf, &ctx, filename ); + if (!SetupFindFirstLineW( hinf, source_disks_files_platform, filename, &ctx ) && + !SetupFindFirstLineW( hinf, source_disks_files, filename, &ctx )) + { + return FALSE; + } } - if (!source_id_str) + if (!SetupGetIntField( &ctx, 1, &id )) return FALSE; - - *source_id = wcstol( source_id_str, &end, 10 ); - if (end == source_id_str || *end) - { - free( source_id_str ); - return FALSE; - } - free( source_id_str ); + *source_id = id; if (SetupGetStringFieldW( &ctx, 2, buffer, buffer_size, required_size )) return TRUE;

1 0

Gabriel Ivăncescu : jscript: Make JS_COUNT_OPERATION a no-op.
by Alexandre Julliard 15 Jul '24

15 Jul '24

Module: wine Branch: master Commit: bfa85536a34e99c4d77bfce67301132e41874d0d URL: https://gitlab.winehq.org/wine/wine/-/commit/bfa85536a34e99c4d77bfce6730113… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Jul 15 16:09:50 2024 +0300 jscript: Make JS_COUNT_OPERATION a no-op. It's not an error, and this just pollutes the logs for no reason. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/regexp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 325b5ad56d6..a29b4bb90e1 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -45,7 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); #define ReportRegExpErrorHelper(a,b,c,d) throw_error((a)->context, E_FAIL, L"") #define JS_ReportErrorNumber(a,b,c,d) throw_error((a), E_FAIL, L"") #define JS_ReportErrorFlagsAndNumber(a,b,c,d,e,f) throw_error((a), E_FAIL, L"") -#define JS_COUNT_OPERATION(a,b) throw_error((a), E_FAIL, L"") +#define JS_COUNT_OPERATION(a,b) do { } while(0) typedef BYTE JSPackedBool;

1 0

Paul Gofman : mshtml: Check get_document_node() result in get_node().
by Alexandre Julliard 15 Jul '24

15 Jul '24

Module: wine Branch: master Commit: 20169cb2e9d9b8824c85a72d23fc05150546da49 URL: https://gitlab.winehq.org/wine/wine/-/commit/20169cb2e9d9b8824c85a72d23fc05… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jul 12 14:02:54 2024 -0600 mshtml: Check get_document_node() result in get_node(). Suggested by Gabriel Ivăncescu. --- dlls/mshtml/htmlnode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index ceb50a17d02..36e89818bb3 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1410,7 +1410,7 @@ HRESULT get_node(nsIDOMNode *nsnode, BOOL create, HTMLDOMNode **ret) hres = get_document_node(dom_document, &document); nsIDOMDocument_Release(dom_document); - if(!document) + if(FAILED(hres)) return E_FAIL; hres = create_node(document, nsnode, ret);

1 0

Dmitry Timoshkov : odbc32: Correct 'WINAPI' placement for function pointers.
by Alexandre Julliard 15 Jul '24

15 Jul '24

Module: wine Branch: master Commit: 289e62203aed4b4795be968c5b80eba3ce720f4a URL: https://gitlab.winehq.org/wine/wine/-/commit/289e62203aed4b4795be968c5b80eb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 15 18:27:21 2024 +0300 odbc32: Correct 'WINAPI' placement for function pointers. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/odbc32/proxyodbc.c | 220 ++++++++++++++++++++++++------------------------ 1 file changed, 110 insertions(+), 110 deletions(-)

1 0

Hans Leidekker : odbc32: Fix a couple of spec file entries.
by Alexandre Julliard 15 Jul '24

15 Jul '24

Module: wine Branch: master Commit: 94143b38aca8164fe83038a4d0ada5d7a8059d28 URL: https://gitlab.winehq.org/wine/wine/-/commit/94143b38aca8164fe83038a4d0ada5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 15 14:49:31 2024 +0200 odbc32: Fix a couple of spec file entries. --- dlls/odbc32/odbc32.spec | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/odbc32/odbc32.spec b/dlls/odbc32/odbc32.spec index f94eaabea26..c42bf55c3eb 100644 --- a/dlls/odbc32/odbc32.spec +++ b/dlls/odbc32/odbc32.spec @@ -5,16 +5,16 @@ 5 stdcall SQLCancel(long) 6 stdcall SQLColAttributes(long long long ptr long ptr ptr) 7 stdcall SQLConnect(long str long str long str long) - 8 stdcall SQLDescribeCol(long long str long ptr ptr ptr ptr ptr) + 8 stdcall SQLDescribeCol(long long ptr long ptr ptr ptr ptr ptr) 9 stdcall SQLDisconnect(long) - 10 stdcall SQLError(long long long str ptr str long ptr) + 10 stdcall SQLError(long long long ptr ptr ptr long ptr) 11 stdcall SQLExecDirect(long str long) 12 stdcall SQLExecute(long) 13 stdcall SQLFetch(long) 14 stdcall SQLFreeConnect(long) 15 stdcall SQLFreeEnv(long) 16 stdcall SQLFreeStmt(long long ) - 17 stdcall SQLGetCursorName(long str long ptr) + 17 stdcall SQLGetCursorName(long ptr long ptr) 18 stdcall SQLNumResultCols(long ptr) 19 stdcall SQLPrepare(long str long) 20 stdcall SQLRowCount(long ptr) @@ -31,14 +31,14 @@ 31 stdcall SQLFreeHandle(long long) 32 stdcall SQLGetConnectAttr(long long ptr long ptr) 33 stdcall SQLGetDescField(long long long ptr long ptr) - 34 stdcall SQLGetDescRec(long long str long ptr ptr ptr ptr ptr ptr ptr) + 34 stdcall SQLGetDescRec(long long ptr long ptr ptr ptr ptr ptr ptr ptr) 35 stdcall SQLGetDiagField(long long long long ptr long ptr) - 36 stdcall SQLGetDiagRec(long long long str ptr str long ptr) + 36 stdcall SQLGetDiagRec(long long long ptr ptr ptr long ptr) 37 stdcall SQLGetEnvAttr(long long ptr long ptr) 38 stdcall SQLGetStmtAttr(long long ptr long ptr) 39 stdcall SQLSetConnectAttr(long long ptr long) 40 stdcall SQLColumns(long str long str long str long str long) - 41 stdcall SQLDriverConnect(long long str long str long ptr long) + 41 stdcall SQLDriverConnect(long long str long ptr long ptr long) 42 stdcall SQLGetConnectOption(long long ptr) 43 stdcall SQLGetData(long long long ptr long ptr) 44 stdcall SQLGetFunctions(long long ptr) @@ -52,14 +52,14 @@ 52 stdcall SQLSpecialColumns(long long str long str long str long long long) 53 stdcall SQLStatistics(long str long str long str long long long) 54 stdcall SQLTables(long str long str long str long str long) - 55 stdcall SQLBrowseConnect(long str long str long ptr) + 55 stdcall SQLBrowseConnect(long str long ptr long ptr) 56 stdcall SQLColumnPrivileges(long str long str long str long str long) - 57 stdcall SQLDataSources(long long str long ptr str long ptr) + 57 stdcall SQLDataSources(long long str long ptr ptr long ptr) 58 stdcall SQLDescribeParam(long long ptr ptr ptr ptr) 59 stdcall SQLExtendedFetch(long long long ptr ptr) 60 stdcall SQLForeignKeys(long str long str long str long str long str long str long) 61 stdcall SQLMoreResults(long) - 62 stdcall SQLNativeSql(long str long str long ptr) + 62 stdcall SQLNativeSql(long str long ptr long ptr) 63 stdcall SQLNumParams(long ptr) 64 stdcall SQLParamOptions(long long ptr) 65 stdcall SQLPrimaryKeys(long str long str long str long) @@ -68,7 +68,7 @@ 68 stdcall SQLSetPos(long long long long) 69 stdcall SQLSetScrollOptions(long long long long) 70 stdcall SQLTablePrivileges(long str long str long str long) - 71 stdcall SQLDrivers(long long str long ptr str long ptr) + 71 stdcall SQLDrivers(long long str long ptr ptr long ptr) 72 stdcall SQLBindParameter(long long long long long long long ptr long ptr) 73 stdcall SQLSetDescField(long long long ptr long) 74 stdcall SQLSetDescRec(long long long long long long long ptr ptr ptr) @@ -88,22 +88,22 @@ 90 stub ODBCSharedVSFlag 106 stdcall SQLColAttributesW(long long long ptr long ptr ptr) 107 stdcall SQLConnectW(long wstr long wstr long wstr long) -108 stdcall SQLDescribeColW(long long wstr long ptr ptr ptr ptr ptr) -110 stdcall SQLErrorW(long long long wstr ptr wstr long ptr) -111 stdcall SQLExecDirectW(long wstr long) -117 stdcall SQLGetCursorNameW(long wstr long ptr) +108 stdcall SQLDescribeColW(long long ptr long ptr ptr ptr ptr ptr) +110 stdcall SQLErrorW(long long long ptr ptr ptr long ptr) +111 stdcall SQLExecDirectW(long ptr long) +117 stdcall SQLGetCursorNameW(long ptr long ptr) 119 stdcall SQLPrepareW(long wstr long) 121 stdcall SQLSetCursorNameW(long wstr long) 127 stdcall SQLColAttributeW(long long long ptr long ptr ptr) 132 stdcall SQLGetConnectAttrW(long long ptr long ptr) 133 stdcall SQLGetDescFieldW(long long long ptr long ptr) -134 stdcall SQLGetDescRecW(long long wstr long ptr ptr ptr ptr ptr ptr ptr) +134 stdcall SQLGetDescRecW(long long ptr long ptr ptr ptr ptr ptr ptr ptr) 135 stdcall SQLGetDiagFieldW(long long long long ptr long ptr) -136 stdcall SQLGetDiagRecW(long long long wstr ptr wstr long ptr) +136 stdcall SQLGetDiagRecW(long long long ptr ptr ptr long ptr) 138 stdcall SQLGetStmtAttrW(long long ptr long ptr) 139 stdcall SQLSetConnectAttrW(long long ptr long) 140 stdcall SQLColumnsW(long wstr long wstr long wstr long wstr long) -141 stdcall SQLDriverConnectW(long long wstr long wstr long ptr long) +141 stdcall SQLDriverConnectW(long long wstr long ptr long ptr long) 142 stdcall SQLGetConnectOptionW(long long ptr) 145 stdcall SQLGetInfoW(long long ptr long ptr) 147 stdcall SQLGetTypeInfoW(long long) @@ -111,16 +111,16 @@ 152 stdcall SQLSpecialColumnsW(long long wstr long wstr long wstr long long long) 153 stdcall SQLStatisticsW(long wstr long wstr long wstr long long long) 154 stdcall SQLTablesW(long wstr long wstr long wstr long wstr long) -155 stdcall SQLBrowseConnectW(long wstr long wstr long ptr) +155 stdcall SQLBrowseConnectW(long wstr long ptr long ptr) 156 stdcall SQLColumnPrivilegesW(long wstr long wstr long wstr long wstr long) -157 stdcall SQLDataSourcesW(long long wstr long ptr wstr long ptr) +157 stdcall SQLDataSourcesW(long long wstr long ptr ptr long ptr) 160 stdcall SQLForeignKeysW(long wstr long wstr long wstr long wstr long wstr long wstr long) -162 stdcall SQLNativeSqlW(long wstr long wstr long ptr) +162 stdcall SQLNativeSqlW(long wstr long ptr long ptr) 165 stdcall SQLPrimaryKeysW(long wstr long wstr long wstr long) 166 stdcall SQLProcedureColumnsW(long wstr long wstr long wstr long wstr long) 167 stdcall SQLProceduresW(long wstr long wstr long wstr long) 170 stdcall SQLTablePrivilegesW(long wstr long wstr long wstr long) -171 stdcall SQLDriversW(long long wstr long ptr wstr long ptr) +171 stdcall SQLDriversW(long long wstr long ptr ptr long ptr) 173 stdcall SQLSetDescFieldW(long long long ptr long) 176 stdcall SQLSetStmtAttrW(long long ptr long) 206 stub SQLColAttributesA @@ -150,7 +150,7 @@ 254 stub SQLTablesA 255 stub SQLBrowseConnectA 256 stub SQLColumnPrivilegesA -257 stdcall SQLDataSourcesA(long long str long ptr str long ptr) +257 stdcall SQLDataSourcesA(long long str long ptr ptr long ptr) 260 stub SQLForeignKeysA 262 stub SQLNativeSqlA 265 stub SQLPrimaryKeysA

1 0

Hans Leidekker : odbc32: Use LoadLibraryExW() instead of LoadLibraryW().
by Alexandre Julliard 15 Jul '24

15 Jul '24

Module: wine Branch: master Commit: ac7f96f0fbdd3f074d2b0cfa32abd72a50d7a5d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/ac7f96f0fbdd3f074d2b0cfa32abd7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 12 09:17:19 2024 +0200 odbc32: Use LoadLibraryExW() instead of LoadLibraryW(). --- dlls/odbc32/proxyodbc.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index c78c76103eb..2b7bf1c4236 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -338,32 +338,20 @@ static const struct win32_funcs *load_driver( const WCHAR *filename ) { HMODULE module; struct win32_driver *driver; - WCHAR *ptr, *path = wcsdup( filename ); + WCHAR *ptr; UINT32 i; for (i = 0; i < win32_drivers.count; i++) { - if (!wcsicmp( filename, win32_drivers.drivers[i]->filename )) - { - free( path ); - return &win32_drivers.drivers[i]->funcs; - } + if (!wcsicmp( filename, win32_drivers.drivers[i]->filename )) return &win32_drivers.drivers[i]->funcs; } - if (!(driver = malloc( sizeof(*driver) + (wcslen(filename) + 1) * sizeof(WCHAR) ))) - { - free( path ); - return NULL; - } + if (!(driver = malloc( sizeof(*driver) + (wcslen(filename) + 1) * sizeof(WCHAR) ))) return NULL; ptr = (WCHAR *)(driver + 1); wcscpy( ptr, filename ); driver->filename = ptr; - if ((ptr = wcsrchr( path, '\\' )) || (ptr = wcsrchr( path, '/' ))) *ptr = 0; - SetDllDirectoryW( path ); - module = LoadLibraryW( filename ); - SetDllDirectoryW( NULL ); - free( path ); + module = LoadLibraryExW( filename, NULL, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_DEFAULT_DIRS ); if (!module) { free( driver );

1 0

Hans Leidekker : odbc32: Forward SQLDriverConnect() to the Unicode version if needed.
by Alexandre Julliard 15 Jul '24

15 Jul '24

Module: wine Branch: master Commit: b134da3bb4286f6e452abd0111657b69d230fe00 URL: https://gitlab.winehq.org/wine/wine/-/commit/b134da3bb4286f6e452abd0111657b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 12 11:13:59 2024 +0200 odbc32: Forward SQLDriverConnect() to the Unicode version if needed. --- dlls/odbc32/proxyodbc.c | 100 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 84 insertions(+), 16 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 2b7bf1c4236..c11b5671b6c 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -3276,6 +3276,57 @@ SQLRETURN WINAPI SQLBindParameter(SQLHSTMT StatementHandle, SQLUSMALLINT Paramet return ret; } +static WCHAR *strnAtoW( const SQLCHAR *str, int in_len ) +{ + WCHAR *ret = NULL; + if (str) + { + int len = MultiByteToWideChar( CP_ACP, 0, (const char *)str, in_len, NULL, 0 ); + if ((ret = malloc( (len + 1) * sizeof(WCHAR) ))) + { + MultiByteToWideChar( CP_ACP, 0, (const char *)str, in_len, ret, len ); + ret[len] = 0; + } + } + return ret; +} + +static SQLRETURN driver_connect_win32_a( struct handle *handle, SQLHWND window, SQLCHAR *in_conn_str, + SQLSMALLINT inlen, SQLCHAR *out_conn_str, SQLSMALLINT buflen, + SQLSMALLINT *outlen, SQLUSMALLINT completion ) +{ + SQLRETURN ret = SQL_ERROR; + SQLWCHAR *in, *out = NULL; + SQLSMALLINT lenW; + + if (handle->win32_funcs->SQLDriverConnect) + return handle->win32_funcs->SQLDriverConnect( handle->win32_handle, window, in_conn_str, inlen, out_conn_str, + buflen, outlen, completion ); + + if (!(in = strnAtoW( in_conn_str, inlen ))) return SQL_ERROR; + if (!(out = malloc( buflen * sizeof(WCHAR) ))) goto done; + ret = handle->win32_funcs->SQLDriverConnectW( handle->win32_handle, window, in, inlen, out, buflen, &lenW, + completion ); + if (SUCCESS( ret )) + { + int len = WideCharToMultiByte( CP_ACP, 0, out, -1, (char *)out_conn_str, buflen, NULL, NULL ); + if (outlen) *outlen = len - 1; + } +done: + free( in ); + free( out ); + return ret; +} + +static SQLRETURN driver_connect_unix_a( struct handle *handle, SQLHWND window, SQLCHAR *in_conn_str, SQLSMALLINT len, + SQLCHAR *out_conn_str, SQLSMALLINT buflen, SQLSMALLINT *len2, + SQLUSMALLINT completion ) +{ + struct SQLDriverConnect_params params = { handle->unix_handle, window, in_conn_str, len, out_conn_str, buflen, + len2, completion }; + return ODBC_CALL( SQLDriverConnect, &params ); +} + /************************************************************************* * SQLDriverConnect [ODBC32.041] */ @@ -3287,8 +3338,8 @@ SQLRETURN WINAPI SQLDriverConnect(SQLHDBC ConnectionHandle, SQLHWND WindowHandle WCHAR *datasource = NULL, *filename = NULL, *connection_string = strdupAW( (const char *)InConnectionString ); SQLRETURN ret = SQL_ERROR; - TRACE("(ConnectionHandle %p, WindowHandle %p, InConnectionString %s, Length %d, OutConnectionString, %p," - " BufferLength, %d, Length2 %p, DriverCompletion %d)\n", ConnectionHandle, WindowHandle, + TRACE("(ConnectionHandle %p, WindowHandle %p, InConnectionString %s, Length %d, OutConnectionString %p," + " BufferLength %d, Length2 %p, DriverCompletion %d)\n", ConnectionHandle, WindowHandle, debugstr_an((const char *)InConnectionString, Length), Length, OutConnectionString, BufferLength, Length2, DriverCompletion); @@ -3318,20 +3369,18 @@ SQLRETURN WINAPI SQLDriverConnect(SQLHDBC ConnectionHandle, SQLHWND WindowHandle if (!SUCCESS((ret = create_env( handle->parent, FALSE )))) goto done; if (!SUCCESS((ret = create_con( handle )))) goto done; - ret = handle->win32_funcs->SQLDriverConnect( handle->win32_handle, WindowHandle, InConnectionString, Length, - OutConnectionString, BufferLength, Length2, DriverCompletion ); + ret = driver_connect_win32_a( handle, WindowHandle, InConnectionString, Length, OutConnectionString, + BufferLength, Length2, DriverCompletion ); } else { - struct SQLDriverConnect_params params = { 0, WindowHandle, InConnectionString, Length, OutConnectionString, - BufferLength, Length2, DriverCompletion }; - TRACE( "using Unix driver %s\n", debugstr_w(filename) ); + if (!SUCCESS((ret = create_env( handle->parent, TRUE )))) goto done; if (!SUCCESS((ret = create_con( handle )))) goto done; - params.ConnectionHandle = handle->unix_handle; - ret = ODBC_CALL( SQLDriverConnect, &params ); + ret = driver_connect_unix_a( handle, WindowHandle, InConnectionString, Length, OutConnectionString, + BufferLength, Length2, DriverCompletion ); } done: @@ -4013,6 +4062,27 @@ SQLRETURN WINAPI SQLColumnsW(SQLHSTMT StatementHandle, WCHAR *CatalogName, SQLSM return ret; } +static SQLRETURN driver_connect_win32_w( struct handle *handle, SQLHWND window, SQLWCHAR *in_conn_str, + SQLSMALLINT len, SQLWCHAR *out_conn_str, SQLSMALLINT buflen, SQLSMALLINT *len2, + SQLUSMALLINT completion ) +{ + if (handle->win32_funcs->SQLDriverConnectW) + return handle->win32_funcs->SQLDriverConnectW( handle->win32_handle, window, in_conn_str, len, out_conn_str, + buflen, len2, completion ); + + if (handle->win32_funcs->SQLDriverConnect) FIXME( "Unicode to ANSI conversion not handled\n" ); + return SQL_ERROR; +} + +static SQLRETURN driver_connect_unix_w( struct handle *handle, SQLHWND window, SQLWCHAR *in_conn_str, SQLSMALLINT len, + SQLWCHAR *out_conn_str, SQLSMALLINT buflen, SQLSMALLINT *len2, + SQLUSMALLINT completion ) +{ + struct SQLDriverConnectW_params params = { handle->unix_handle, window, in_conn_str, len, out_conn_str, buflen, + len2, completion }; + return ODBC_CALL( SQLDriverConnectW, &params ); +} + /************************************************************************* * SQLDriverConnectW [ODBC32.141] */ @@ -4055,20 +4125,18 @@ SQLRETURN WINAPI SQLDriverConnectW(SQLHDBC ConnectionHandle, SQLHWND WindowHandl if (!SUCCESS((ret = create_env( handle->parent, FALSE )))) goto done; if (!SUCCESS((ret = create_con( handle )))) goto done; - ret = handle->win32_funcs->SQLDriverConnectW( handle->win32_handle, WindowHandle, InConnectionString, Length, - OutConnectionString, BufferLength, Length2, DriverCompletion ); + ret = driver_connect_win32_w( handle, WindowHandle, InConnectionString, Length, OutConnectionString, + BufferLength, Length2, DriverCompletion ); } else { - struct SQLDriverConnectW_params params = { 0, WindowHandle, InConnectionString, Length, OutConnectionString, - BufferLength, Length2, DriverCompletion }; - TRACE( "using Unix driver %s\n", debugstr_w(filename) ); + if (!SUCCESS((ret = create_env( handle->parent, TRUE )))) goto done; if (!SUCCESS((ret = create_con( handle )))) goto done; - params.ConnectionHandle = handle->unix_handle; - ret = ODBC_CALL( SQLDriverConnectW, &params ); + ret = driver_connect_unix_w( handle, WindowHandle, InConnectionString, Length, OutConnectionString, + BufferLength, Length2, DriverCompletion); } done:

1 0

Hans Leidekker : odbc32: Forward SQLGetDiagRec() to the Unicode version if needed.
by Alexandre Julliard 15 Jul '24

15 Jul '24

Module: wine Branch: master Commit: 645810381db5199c141663cd281fff4cea706ed3 URL: https://gitlab.winehq.org/wine/wine/-/commit/645810381db5199c141663cd281fff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 12 12:11:51 2024 +0200 odbc32: Forward SQLGetDiagRec() to the Unicode version if needed. --- dlls/odbc32/proxyodbc.c | 73 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 62 insertions(+), 11 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index c11b5671b6c..6c67ec2aeb0 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -1730,6 +1730,40 @@ SQLRETURN WINAPI SQLGetDiagField(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLSM return ret; } +static SQLRETURN get_diag_rec_unix_a( SQLSMALLINT handle_type, struct handle *handle, SQLSMALLINT rec_num, + SQLCHAR *state, SQLINTEGER *native_err, SQLCHAR *msg, SQLSMALLINT buflen, + SQLSMALLINT *retlen ) +{ + struct SQLGetDiagRec_params params = { handle_type, handle->unix_handle, rec_num, state, native_err, msg, + buflen, retlen }; + return ODBC_CALL( SQLGetDiagRec, &params ); +} + +static SQLRETURN get_diag_rec_win32_a( SQLSMALLINT handle_type, struct handle *handle, SQLSMALLINT rec_num, + SQLCHAR *state, SQLINTEGER *native_err, SQLCHAR *msg, SQLSMALLINT buflen, + SQLSMALLINT *retlen ) +{ + SQLRETURN ret = SQL_ERROR; + SQLWCHAR stateW[6], *msgW = NULL; + SQLSMALLINT lenW; + + if (handle->win32_funcs->SQLGetDiagRec) + return handle->win32_funcs->SQLGetDiagRec( handle_type, handle->win32_handle, rec_num, state, native_err, + msg, buflen, retlen ); + + if (!(msgW = malloc( buflen * sizeof(WCHAR) ))) return SQL_ERROR; + ret = handle->win32_funcs->SQLGetDiagRecW( handle_type, handle->win32_handle, rec_num, stateW, native_err, + msgW, buflen, &lenW ); + if (SUCCESS( ret )) + { + int len = WideCharToMultiByte( CP_ACP, 0, msgW, -1, (char *)msg, buflen, NULL, NULL ); + if (retlen) *retlen = len - 1; + WideCharToMultiByte( CP_ACP, 0, stateW, -1, (char *)state, 6, NULL, NULL ); + } + free( msgW ); + return ret; +} + /************************************************************************* * SQLGetDiagRec [ODBC32.036] */ @@ -1748,14 +1782,13 @@ SQLRETURN WINAPI SQLGetDiagRec(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLSMAL if (handle->unix_handle) { - struct SQLGetDiagRec_params params = { HandleType, handle->unix_handle, RecNumber, SqlState, NativeError, - MessageText, BufferLength, TextLength }; - ret = ODBC_CALL( SQLGetDiagRec, &params ); + ret = get_diag_rec_unix_a( HandleType, handle, RecNumber, SqlState, NativeError, MessageText, BufferLength, + TextLength ); } else if (handle->win32_handle) { - ret = handle->win32_funcs->SQLGetDiagRec( HandleType, handle->win32_handle, RecNumber, SqlState, NativeError, - MessageText, BufferLength, TextLength ); + ret = get_diag_rec_win32_a( HandleType, handle, RecNumber, SqlState, NativeError, MessageText, BufferLength, + TextLength ); } TRACE("Returning %d\n", ret); @@ -3917,6 +3950,26 @@ SQLRETURN WINAPI SQLGetDiagFieldW(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLS return ret; } +static SQLRETURN get_diag_rec_unix_w( SQLSMALLINT handle_type, struct handle *handle, SQLSMALLINT rec_num, + SQLWCHAR *state, SQLINTEGER *native_err, SQLWCHAR *msg, SQLSMALLINT buflen, + SQLSMALLINT *retlen ) +{ + struct SQLGetDiagRecW_params params = { handle_type, handle->unix_handle, rec_num, state, native_err, msg, + buflen, retlen }; + return ODBC_CALL( SQLGetDiagRecW, &params ); +} + +static SQLRETURN get_diag_rec_win32_w( SQLSMALLINT handle_type, struct handle *handle, SQLSMALLINT rec_num, + SQLWCHAR *state, SQLINTEGER *native_err, SQLWCHAR *msg, SQLSMALLINT buflen, + SQLSMALLINT *retlen ) +{ + if (handle->win32_funcs->SQLGetDiagRecW) + return handle->win32_funcs->SQLGetDiagRecW( handle_type, handle->win32_handle, rec_num, state, native_err, + msg, buflen, retlen ); + if (handle->win32_funcs->SQLGetDiagRec) FIXME( "Unicode to ANSI conversion not handled\n" ); + return SQL_ERROR; +} + /************************************************************************* * SQLGetDiagRecW [ODBC32.136] */ @@ -3935,14 +3988,13 @@ SQLRETURN WINAPI SQLGetDiagRecW(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLSMA if (handle->unix_handle) { - struct SQLGetDiagRecW_params params = { HandleType, handle->unix_handle, RecNumber, SqlState, NativeError, - MessageText, BufferLength, TextLength }; - ret = ODBC_CALL( SQLGetDiagRecW, &params ); + ret = get_diag_rec_unix_w( HandleType, handle, RecNumber, SqlState, NativeError, MessageText, BufferLength, + TextLength ); } else if (handle->win32_handle) { - ret = handle->win32_funcs->SQLGetDiagRecW( HandleType, handle->win32_handle, RecNumber, SqlState, NativeError, - MessageText, BufferLength, TextLength ); + ret = get_diag_rec_win32_w( HandleType, handle, RecNumber, SqlState, NativeError, MessageText, BufferLength, + TextLength ); } TRACE("Returning %d\n", ret); @@ -4069,7 +4121,6 @@ static SQLRETURN driver_connect_win32_w( struct handle *handle, SQLHWND window, if (handle->win32_funcs->SQLDriverConnectW) return handle->win32_funcs->SQLDriverConnectW( handle->win32_handle, window, in_conn_str, len, out_conn_str, buflen, len2, completion ); - if (handle->win32_funcs->SQLDriverConnect) FIXME( "Unicode to ANSI conversion not handled\n" ); return SQL_ERROR; }

1 0